Adding VirtualBox client support (changing to Vagrant boxes provided by Canonical).
Merge branch 'virtualbox-client'