Merge "Fix availability zone client in compute admin test"