AMBARI-3580. Cluster deployment fails on latest trunk. (swagle)