Merge branch '5842-node-manager-tighten-successful-boot-criteria-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 6 May 2015 20:57:29 +0000 (16:57 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 6 May 2015 20:57:42 +0000 (16:57 -0400)
Closes #5842, #5931.


Trivial merge