AMBARI-1647. Integrate server and agent changes for upgrade on cluster. (Sumit Mohanty via swagle)

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