Merge remote-tracking branch 'origin/trunk' into origin-trunk

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java

@@ -170,7 +170,7 @@ public class ServiceConfigVersionResourceProvider extends
       configMap.put("type", config.getType());
       configMap.put("tag", config.getVersionTag());
       configMap.put("version", config.getVersion());
-      configMap.put("properties", config.getConfigs());
+      configMap.put("properties", new TreeMap(config.getConfigs()));
       configMap.put("properties_attributes", config.getConfigAttributes());
       result.add(configMap);
     }

ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml

@@ -32,7 +32,14 @@
     </description>
   </property>
 
-
-
+  <property>
+    <name>oozie.service.coord.check.maximum.frequency</name>
+    <value>false</value>
+    <description>
+      When true, Oozie will reject any coordinators with a frequency faster than 5 minutes.  It is not recommended to disable
+      this check or submit coordinators with frequencies faster than 5 minutes: doing so can cause unintended behavior and
+      additional system stress.
+    </description>
+  </property>
 
 </configuration>