Fix for return_to_all_vms
Merge pull request #534 from psav/sorry-jenkins

Fix for return_to_all_vms