Merge branch '9120-node-manager-search-ex-methods-wip'
authorBrett Smith <brett@curoverse.com>
Tue, 3 May 2016 19:22:33 +0000 (15:22 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 3 May 2016 19:22:33 +0000 (15:22 -0400)
Closes #9120, #9124.


Trivial merge