Merge "cm: Update the path for jenkins-generated files" into cm-11.0