Merge "Rename folder for jenkins job"