be more careful about downing services

swift-proxy likes to not shut down during grenade runs, and the
failure case just means all our tests take forever timing out on
trying to connect to it over glance.

put in a few more checks about whether the services are in the
right states.

Change-Id: Iedfd91cdded632f7f3a2b5f127c2901f8762adaa