Merge branch 'master' into dev-karaf-4.2.1

Change-Id: I06c540c539d7d12eb0b563884992a600c930897d
diff --git a/tools/dev/p4vm/Vagrantfile b/tools/dev/p4vm/Vagrantfile
index 259e380..cd4c8c3 100644
--- a/tools/dev/p4vm/Vagrantfile
+++ b/tools/dev/p4vm/Vagrantfile
@@ -2,7 +2,7 @@
 
 Vagrant.configure(2) do |config|
   if P4_VM_TYPE == "tutorial"
-    config.vm.box = "fso/xenial64-desktop"
+    config.vm.box = "lasp/ubuntu16.04-desktop"
   else
     config.vm.box = "bento/ubuntu-16.04"
   end