use restart instead, just to be sure
add some stuff to aid in debugging smoke failures
Merge remote-tracking branch 'origin/1.12' into foundation

Conflicts:
	smoke-test/do-smoke-test.sh
Merge remote-tracking branch 'origin/foundation' into develop