AMBARI-2290. Ambari Upgrade prcoess should preserve the old configs and add the new config options to the old config files. (Dmitry Sen via smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1489966 13f79535-47bb-0310-9956-ffa450edef68