Merge pull request #2769 from hiveww/AMBARI-25109-trunk