AMBARI-2586. ambari-server encrypt-passwords fails (Dmitry Lysnichenko via smohanty)

ambari-server/src/main/python/ambari-server.py

@@ -2639,7 +2639,7 @@ def setup_master_key():
       print 'Failed to save secure LDAP password.'
   pass
 
-  update_properties(propertyMap)
+  update_properties(properties, propertyMap)
 
   # Since files for store and master are created we need to ensure correct
   # permissions