Bit of infrastructure.
Unbreak multi-node tests involving plugins
Merge bug 24926