Cleanup Solaris 11 Vagrantfile, update Windows bootstrap