ENG-4106: Fixups for selfcheck2.
Catch NoConnectionsException in the right place.
Add a timeout if progress isn't being made.
Better logging.
Some additional robustness.