Merge "Remove Block Storage API v2 support"