Merge "port test_availability_zone into nova v3 part2"