double commit I7b20dd71c2505afb5f296652e0ceb949ea51429c to support heat in juno mainline, these are provisioning changes

Change-Id: I3c61113b85cd0edeb7b9a237bdfdeeef32e72d79
Merge "double commit I7b20dd71c2505afb5f296652e0ceb949ea51429c to support heat in juno mainline, these are provisioning changes"