Merge branch '11349-nodemanager-status-api'
authorTom Clegg <tom@curoverse.com>
Tue, 11 Apr 2017 15:33:17 +0000 (11:33 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 11 Apr 2017 15:33:17 +0000 (11:33 -0400)
refs #11349


Trivial merge