Merge "Switch global-jjb jobs to use mvn35"