cylc/cylc#720: test-battery restart timeout handler
Tweak regex.
cylc/cylc#720: debug info
cylc/cylc#720: exploratory changes
cylc/cylc#720: improve task names
Merge branch 'master' into 720.fix
Merge remote branch 'upstream/master' into output.tweak-test-regex

Conflicts:
	tests/output/00-submission.t
Merge branch 'master' into 720.fix
cylc/cylc#720: make loadleveler test changes
cylc/cylc#720: remove debug
Merge pull request #721 from benfitzpatrick/720.test-battery-restart-shutdown

#720: test-battery restart timeout handler
Merge remote branch 'upstream/master' into output.tweak-test-regex
Change while loop.
Merge pull request #726 from arjclark/output.tweak-test-regex

Tweak regex.
Merge branch 'master' into 737.thread-stop-adjustment

Conflicts:
	tests/output/00-submission.t