AMBARI-6957.  Fixes NPE during cluster create with blueprint.