Separate minion controller from master.
Merge pull request #1997 from ddysher/split-master

Separate minion controller from master.