Merge "Adds v2 keystone service test to service v3"