Don't wait forever for notebook server to launch/die for tests

Should turn occasional hangs into straightforward errors.
Simplify waiting for notebook server to die.
Clarify waiting for notebook server to launch
Merge pull request #4773 from takluyver/nbtests-dont-wait-forever

Don't wait forever for notebook server to launch/die for tests