Change in jenkins[master]: upstream re-basing capability