Merge into master from pull request #348:
loci: remove inheritance unions and header classes (https://github.com/floodlight/loxigen/pull/348)