Merge "Correct naming of keystone v3 params in lab and cleanup job"