Merge "Add keystone client optional arg tests"