Fix p4vm script to export ova and tutorial script

- Modify missing command in tutorial-bootstrap.sh
- Modify command order in ova-cleanup.sh
- Modify the way to execute ovs-cleanup.sh in vm

Change-Id: Ib010d07b31d9b06f3c4b04d34b2036c0058ca300
(cherry picked from commit f1a04004363d2c59108ad3ca9277c09ec1a2167a)
diff --git a/tools/dev/p4vm/ova-cleanup.sh b/tools/dev/p4vm/ova-cleanup.sh
index bcde882..95fa468 100755
--- a/tools/dev/p4vm/ova-cleanup.sh
+++ b/tools/dev/p4vm/ova-cleanup.sh
@@ -2,9 +2,6 @@
 
 set -xe
 
-# Delete vagrant user
-sudo userdel -r -f vagrant
-
 # Free space on disk
 sudo rm -rf ~/p4tools
 sudo rm -rf ~/quagga
@@ -25,3 +22,7 @@
 
 history -c
 rm -f ~/.bash_history
+
+# Delete vagrant user
+sudo userdel -r -f vagrant
+