[10-stable] Don't trap TERM if not in daemon mode

The whole point if this magic is meaningless if we're not in daemon
mode.
Merge pull request #1314 from jaymzh/fixsignals

[10-stable] Don't trap TERM if not in daemon mode