Merge into master from pull request #48:
Fixes for java OXM stuff and implementation for Match structures in versions 1.2,1.3 (https://github.com/floodlight/loxigen/pull/48)