Merge branch '4670-node-manager-robust-tags-wip'
authorBrett Smith <brett@curoverse.com>
Thu, 18 Dec 2014 21:20:15 +0000 (16:20 -0500)
committerBrett Smith <brett@curoverse.com>
Thu, 18 Dec 2014 21:20:30 +0000 (16:20 -0500)
Closes #4670, #4812.


Trivial merge