Change aptitude upgrade to aptitude safe-upgrade

Fixes the below error when updating Vagrant
==> default: The "upgrade" command is deprecated; use "safe-upgrade"
instead.
Merge branch 'vagrantupgrade2' into test