Fixes 7104 - make sure the service_wait will be used as the default provider
Merge pull request #5 from iNecas/issue/7104

Fixes 7104 - make sure the service_wait will be used as the default provider