Merge branch '11221-always-restart-services'
authorTom Clegg <tom@curoverse.com>
Thu, 23 Mar 2017 18:51:21 +0000 (14:51 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 23 Mar 2017 18:51:21 +0000 (14:51 -0400)
closes #11221


Trivial merge