[CS] Move to new rspec-mocks API

Fixes deprecation warnings
Merge branch 'develop' into feature/channel-not-found