Backporting for branch-1.2.3. (yusaku)

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