Overhaul to handle SIGTERM properly, with orderly shutdown of aux processes.
Merge branch 'fix-app-sigterm' into develop

Conflicts:
	bin/start-pgbouncer-stunnel