Merge "Properly clean up after SIGTERM (kill) and Ctrl-c" into stable/brahmaputra
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Thu, 4 Feb 2016 16:39:46 +0000 (16:39 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 4 Feb 2016 16:39:47 +0000 (16:39 +0000)

Trivial merge