Extend the waits for deleting providers
Merge pull request #535 from psav/extend_waits

Extend the waits for deleting providers