SAK-23904 - Additional fixups on the vms for phase 1


git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/SAK-23904@129830 66ffb92e-73f9-0310-93c1-f5514f145a0a