AMBARI-2165. Ambari server upgrade fails when upgrading second time. (smohanty)

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