Merge branch '4.16'

Author: nvazquez

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

@@ -1057,7 +1057,7 @@ public Pair<Configuration, String> resetConfiguration(final ResetCfgCmd cmd) thr
                     s_logger.error("Failed to reset configuration option, name: " + name + ", defaultValue:" + defaultValue);
                     throw new CloudRuntimeException("Failed to reset configuration value. Please contact Cloud Support.");
                 }
-                optionalValue = Optional.ofNullable(configKey != null ? configKey.value() : config.getValue());
+                optionalValue = Optional.ofNullable(configKey != null ? configKey.value() : _configDao.findByName(name).getValue());
                 newValue = optionalValue.isPresent() ? optionalValue.get().toString() : defaultValue;
         }