Merge "Add Keystone role and service test cases"