Fixes for java OXM stuff and implementation for Match structures in versions 1.2,1.3

Reviewer: @andi-bigswitch