Merge into master from pull request #127:
loxi of_g reorganisation (https://github.com/floodlight/loxigen/pull/127)