Merge branch 'channel_list_mutex' of ssh://git.indexdata.com/home/git/pub/pazpar2...