Refactor into base swarm and master/minion swarm
Merge pull request #14243 from cachedout/masterswarm

Refactor into base swarm and master/minion swarm