Merge "Services test for Keystone version 2 api services"