Make merge job pull in latest code, and update jenkins jobs