JBTM-1617. When testing pull requests do a rebase to the merge point (4.17)