Add people equivalence storage and resolution
Merge childrefs when merging content groups
Merge branch 'mbst-4778-people-equivalence' into stage

* mbst-4778-people-equivalence:
  Merge childrefs when merging content groups
  Add people equivalence storage and resolution

Conflicts:
	src/main/java/org/atlasapi/equiv/OutputContentMerger.java