Merge branch 'master' of https://github.com/6fusion/adaptor-vmware
Fix up environment deployment files.
Added logging to diagnostics