Merge branch '10846-nodemanager-errors' closes #10846
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 13 Feb 2017 17:01:41 +0000 (12:01 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 13 Feb 2017 17:01:41 +0000 (12:01 -0500)

Trivial merge