Fixed edm:incorporates generation
Fixed NPE in cc:License check for ore:Aggregation
Hierarchical object optimizations
Merge remote-tracking branch 'origin/neo4j' into masterNeoMerge