EUCA-7428
Fallout from the zones/availabilityzone model fixes in EUCA-7220.