Merge pull request #255 from hashicorp/oss/merge-main-e8a10b313135baf91a18066cf45f3b36bfee54df

[main] OSS to ENT merge of (e8a10b3)

ui/admin/config/features.js

@@ -27,6 +27,7 @@ const baseEdition = {
   'target-worker-filters-v2-hcp': false,
   'target-network-address': false,
   'vault-worker-filter': false,
+  'ldap-auth-methods': false,
 };
 // Editions maps edition keys to their associated featuresets.
 const featureEditions = {};
@@ -37,6 +38,7 @@ featureEditions.oss = {
   'static-credentials': true,
   'target-worker-filters-v2': true,
   'target-network-address': true,
+  'ldap-auth-methods': false,
 };
 featureEditions.enterprise = {
   ...featureEditions.oss,