Merge pull request #4 from iNecas/issue/7104

Fixes 7104 - make sure qpidd is really running after service starts
Fixes 7104 - make sure the service_wait will be used as the default provider