Merge "Add Keystone v3 params to job definitions"