#4230 #4215 Reset account settings which visible under domain settings

Author: ustcweizhou

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -885,8 +885,11 @@ public Pair<Configuration, String> resetConfiguration(final ResetCfgCmd cmd) thr
             throw new InvalidParameterValueException("cannot handle multiple IDs, provide only one ID corresponding to the scope");
         }
 
-        if (scope != null && !scope.equals(ConfigKey.Scope.Global.toString()) && !configScope.contains(scope)) {
-            throw new InvalidParameterValueException("Invalid scope id provided for the parameter " + name);
+        if (scope != null && !scope.equals(ConfigKey.Scope.Global.toString()) && !configScope.equals(scope)) {
+            if (EnableAccountSettingsForDomain.value() &&
+                    !(configScope.equals(ConfigKey.Scope.Account.toString()) && scope.equals(ConfigKey.Scope.Domain.toString()))) {
+                throw new InvalidParameterValueException("Invalid scope id provided for the parameter " + name);
+            }
         }
 
         String newValue = null;