[Brightbox] Fixes service deprecations
[Brightbox] Updates to collaboration models
Merge pull request #2044 from brightbox/collaboration_updates

[Brightbox] Collaboration model updates