Merge changes from topics 'bootstrap-refactor', '994'
authorAndrew Grimberg <[email protected]>
Thu, 5 May 2016 17:36:13 +0000 (17:36 +0000)
committerGerrit Code Review <[email protected]>
Thu, 5 May 2016 17:36:13 +0000 (17:36 +0000)
* changes:
  Re-factor vagrant bootstrap
  Sync bootstrap.sh with build.sh
  Cleanup vagrant


Trivial merge