I decided to move to ode1x branch with my contributions, because trunk is too unstable for now.
I added a test case for FlushBeforeQueries=false, wchich consists of 50 invokes to external JBI endpoint. It fails before and passes after applying patch.
I rerun successfully all tests on ode1x branch to make sure there's no regression after those 2 patches, so you can commit them.
jbi-tests.diff also contains improvement that there's no more reference to jbi-examples.
I worked on revision 738300 (24th jan).