Merge "Remove Cinder v2 RBAC tests"