config depot fixes

Author: sureshanaparti

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41610to41700.java

@@ -169,7 +169,7 @@ private Pair<Long, Long> getConfigurationGroupAndSubGroup(Connection conn, Strin
                     for (String configKeyword : keywordsList) {
                         if (StringUtils.isNotBlank(configKeyword)) {
                             configKeyword = configKeyword.strip();
-                            if (configKeyword.equalsIgnoreCase(name) || configKeyword.toLowerCase().startsWith(name.toLowerCase())) {
+                            if (configKeyword.equalsIgnoreCase(name)) {
                                 subGroupId = keywordsSubGroupId;
                                 groupId = keywordsGroupId;
                                 return new Pair<Long, Long>(groupId, subGroupId);

framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java

@@ -188,23 +188,40 @@ private void createOrupdateConfigObject(Date date, String componentName, ConfigK
 
             _configDao.persist(vo);
         } else {
+            boolean configUpdated = false;
             if (vo.isDynamic() != key.isDynamic() || !ObjectUtils.equals(vo.getDescription(), key.description()) || !ObjectUtils.equals(vo.getDefaultValue(), key.defaultValue()) ||
                 !ObjectUtils.equals(vo.getScope(), key.scope().toString()) ||
-                !ObjectUtils.equals(vo.getComponent(), componentName) ||
-                (key.displayText() != null && !ObjectUtils.equals(vo.getDisplayText(), key.displayText())) ||
-                (key.parent() != null && !ObjectUtils.equals(vo.getParent(), key.parent())) ||
-                (key.group() != null && vo.getGroupId() != groupId) ||
-                (key.subGroup() != null && vo.getSubGroupId() != subGroupId)) {
+                !ObjectUtils.equals(vo.getComponent(), componentName)) {
                 vo.setDynamic(key.isDynamic());
                 vo.setDescription(key.description());
-                vo.setDisplayText(key.displayText());
                 vo.setDefaultValue(key.defaultValue());
                 vo.setScope(key.scope().toString());
                 vo.setComponent(componentName);
+                vo.setUpdated(date);
+                configUpdated = true;
+            }
+
+            if (key.displayText() != null && !ObjectUtils.equals(vo.getDisplayText(), key.displayText())) {
+                vo.setDisplayText(key.displayText());
+                configUpdated = true;
+            }
+
+            if (key.parent() != null && !ObjectUtils.equals(vo.getParent(), key.parent())) {
                 vo.setParent(key.parent());
+                configUpdated = true;
+            }
+
+            if (key.group() != null && vo.getGroupId() != groupId) {
                 vo.setGroupId(groupId);
+                configUpdated = true;
+            }
+
+            if (key.subGroup() != null && vo.getSubGroupId() != subGroupId) {
                 vo.setSubGroupId(subGroupId);
-                vo.setUpdated(date);
+                configUpdated = true;
+            }
+
+            if (configUpdated) {
                 _configDao.persist(vo);
             }
         }
@@ -285,9 +302,6 @@ private Pair<Long, Long> getConfigurationGroupAndSubGroupByName(String configNam
             if (nameWords.length > 0) {
                 for (int index = 0; index < nameWords.length; index++) {
                     ConfigurationSubGroupVO configSubGroup = _configSubGroupDao.findByName(nameWords[index]);
-                    if (configSubGroup == null) {
-                        configSubGroup = _configSubGroupDao.startsWithName(nameWords[index]);
-                    }
 
                     if (configSubGroup == null) {
                         configSubGroup = _configSubGroupDao.findByKeyword(nameWords[index]);