Fix violations.
SONAR-4100 Handle case when dispatcher/channel does not exist anymore
Merge branch 'current'