provisioning changes to support heat on ubuntu1404/juno, this also tested with icehouse build

Change-Id: I7b20dd71c2505afb5f296652e0ceb949ea51429c
Merge "provisioning changes to support heat on ubuntu1404/juno, this also tested with icehouse build" into R2.0