Merge into master from pull request #47:
Java_gen: Richer OXM support, factory reorganization (https://github.com/floodlight/loxigen/pull/47)