HCOLL-163 renamed channel replicator to channel provider
Merge remote-tracking branch 'origin/master'