make changes for none provisioning and change directory for yaml file
 make changes for none provisioning and change directory for yaml file
Merge remote-tracking branch 'rt/master'
Code cleanup, before a merge of rt's repo