Merge "Add tests for share type availability_zones extra-spec"