Augment vhm integration testing
Merge branch 'master' of github.com:vmware-serengeti/vhm