Merge "Add support for test mode to keystone_policy"