Fixing jenkins failures

This isn't the code which fixes the race-failing test; that is elsewhere.  This simply helps minimise the impact of races elsewhere.  I'd be in favour of bumping the `log.debug` below up to `warn` (in the case where `SERVICE_UP` soon becomes true), and perhaps explicitly run enrichers related to `SERVICE_UP` computation before or instead of any wait.