Fixes #7104,7239 - update certs and service_wait modules