Fixing tests
Merge pull request #4836 from danmcp/master

Merged by openshift-bot
Interim commit: contributor's guide and vagrant guide
Vagrant Guide: VirtualBox workflow
Added content through vagrant sync