Merge "Remove unnecessary client alias in AvailabilityZoneTestJson"