Allow e2e tests to run with vagrant
Merge pull request #1993 from hmrm/e2e-vagrant

Allow e2e tests to run with vagrant
Separate minion controller from master.