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

JBTM-1617. When testing pull requests do a rebase to the merge point (master)
JBTM-1407. Build option to build jts only with jacorb or both orbs