Backporting patches for 1.2.1 release

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/branch-1.2@1442010 13f79535-47bb-0310-9956-ffa450edef68