Merge pull request #2777 from hiveww/AMBARI-25120-trunk