Merge "Correct keystonev3 params for lab and cleanup job"