Cloud provider wait

Adds the same provider_wait functionality that has been implemented in Infrastructure