Merge pull request #90 from daniellemayne/develop

bugz 5161: use network id instead of port when launching vms