AMBARI-5145.  Fixed an issue that could result in a NPE when deploying a cluster via a blueprint.