Merge branch '11254-nodemanager-no-actor' closes #11254
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Mar 2017 20:52:11 +0000 (16:52 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Mar 2017 20:52:11 +0000 (16:52 -0400)

Trivial merge