Waits up to 10 seconds for shutdowns to complete before returning.
Helps ensure restarts will actually start.
Allows us to remove the old 1 second sleep between start and stop,
which was not always necessary and not always enough.
Change-Id: I45c30cf2ffa29a77ee30b2b20b87519f32ee0b61