Merge "Change bootstrap jenkins jobs"