JBTM-1617. When testing pull requests do a rebase to the merge point
Merge pull request #265 from Gytis/4.17-JBTM-1617

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