checkin of precise64-base-upgrade
Merge branches 'vagrant-precise64-upgrade' and 'master'