AMBARI-1569. Add AMBARI-1536 and 1537 back. (Xi Wang via yusaku)

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