Merge "compute: Skip AttachVolumeShelveTestJSON when cross_az_attach unavailable"