Change in jenkins[master]: Some fixes for the standard jobs