CS-5503 - Upgrading Newscoop from 4.2 -> 4.3 issues
Merge pull request #811 from takeit/v4.2.2-current

[WIP] CS-5503 - Upgrading Newscoop from 4.2 -> 4.3 issues