Bug 1032557 - Synchronize logic for collections r=crdlc
Merge pull request #21200 from KevinGrandon/bug_1032557_collections_synchronize

Bug 1032557 - Synchronize logic for collections