Merge branch '5313-node-manager-node-naming-tag-wip'
authorBrett Smith <brett@curoverse.com>
Wed, 18 Mar 2015 12:56:54 +0000 (08:56 -0400)
committerBrett Smith <brett@curoverse.com>
Wed, 18 Mar 2015 12:57:32 +0000 (08:57 -0400)
Refs #5313.  Closes #5434, #5467.


Trivial merge