Issue #2650588 by tim.plunkett, Wim Leers, alexpott, dawehner: Entities with plugin collections should be updated before serialization