Adjust crbserver dependencies
Merge pull request #4903 from mmascher/master

Adjust crbserver dependencies