Merge "Adds keystone roles v2 tests in v3"