Sped up our build today by detecting service stop rather than waiting five minutes (twice) in hopes it had happened
