comment/FIXME duplicate apache definition when combining classes on a single node

Change-Id: If96b36da28e2877bf6d25de5fa72f249733c1eee
Merge "comment/FIXME duplicate apache definition when combining classes on a single node" into production