Merge into master from pull request #269:
java/OFMatchV3Ver13: bugfix for MatchFieldIterator (https://github.com/floodlight/loxigen/pull/269)