Merge "Keystone tests - v2 Endpoints"