Merge branch 'development' of github.com:aakb/vagrant into development
Issue #8255 by tuj: Added configuration.js to bootstrap.