Merge branch '8236-nodemanager-watchdog' closes #8236
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 18 May 2016 13:27:15 +0000 (09:27 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 18 May 2016 13:27:15 +0000 (09:27 -0400)

Trivial merge