(20750) move vm setup/teardown from test steps to lib
Merge branch 'master' into vm-control-lib

Conflicts:
	setup/cleanup/00-vmrun.rb
	setup/early/00-vmrun.rb
fix whitespace
Merge pull request #448 from anodelman/vm-control-lib

(20750) move vm setup/teardown from test steps to lib