Merge pull request #2722 from atkach/AMBARI-25042-trunk