Merge pull request #1315 from jaymzh/fixsignals-11

[11] Don't catch SIGTERM if not in daemon mode
Conflicts:
	CHANGELOG.md
	CONTRIBUTIONS.md
	RELEASE_NOTES.md