Merge pull request #2161 from benthecarman/prune-stale-channels-rgs