Fixes #7104,7239 - update certs and service_wait modules
Merge pull request #112 from iNecas/issue/7104

Fixes #7104,7239 - update certs and service_wait modules