Merge "Added AvailabilityZoneFilter to Nova"