Fix for return_to_all_vms
Extend the waits for deleting providers
Merge pull request #534 from psav/sorry-jenkins

Fix for return_to_all_vms
Merge pull request #535 from psav/extend_waits

Extend the waits for deleting providers