4.x
bindings: basic support for #if preprocessor directives
Added Java ORB test
features2d: remove deprecated java wrappers
java: integrate code from base modules
Merge remote-tracking branch 'upstream/3.4' into merge-3.4