Merge "Add config option to use system token in keystone tests"