AMBARI-5037. Displaced vertex in the hive query layout. (srimanth)
AMBARI-5061. Ambari Upgrade stack command failed. (swagle)