GUI-337: Set proper label/value for vm type choices passed to policy generator.
GUI-337: Add availability zone choices to policy generator