TRUNK-4418 - Fix random failure of ModuleActivatorTest
Merge pull request #1136 from jkondrat/TRUNK-4418

TRUNK-4418 - Fix random failure of ModuleActivatorTest
TRUNK-4529: Prevent voiding a Person linked to Provider(s) and/or User(s) metadata