Merge "Properly clean up after SIGTERM (kill) and Ctrl-c"
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Thu, 4 Feb 2016 10:02:28 +0000 (10:02 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 4 Feb 2016 10:02:28 +0000 (10:02 +0000)

Trivial merge