Revamp e2e basic test to use a smaller container.
Merge pull request #1810 from thockin/vagrant

Revamp e2e basic test to use a smaller container.