add location/zone to vm creation
lookup zoneid
Merge branch '3.1m5-fix'