Merge Ambari TRUNK in