Update the forwarded ports and remove usage of vagrant-berkshelf

Bring in the changes made by Justin Shepherd in master to stable/havana to make
it easier to work with Vagrant-deployed OpenStack remotely.

As of the time of this commit, vagrant-berkshelf isn't playing nicely with the
other plugins, so instructions have been updated not to use it.

Change-Id: I20d339d3fbfcecbda8142cd21333665bb5c55371