Clean up e2e test
Merge pull request #2043 from hmrm/e2e-vagrant

Clean up e2e bash-in-go script