AMBARI-2254 - reverting merge

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