Fix docblocks in CollectionTrait
Merge pull request #2762 from bcrowe/3.0-collection-trait

3.0 - Fix docblocks in CollectionTrait