Fix custom property entity compositing

Calling `addProperty` on an existing entity would not be reflected in
existing composited versions of that entity.
Merge pull request #2216 from AnalyticalGraphicsInc/issue2209

Fix custom property entity compositing