Merge pull request #2400 from swapanshridhar/branch-feature-AMBARI-14714-stable