Merge "Vagrant and start-up script updates for GBP image"