added check for null MuxChannel on merge
added check for null MuxChannel on merge

deepnarsay/JGroups,slaskawi/JGroups,Sanne/JGroups,slaskawi/JGroups,Sanne/JGroups,TarantulaTechnology/JGroups,TarantulaTechnology/JGroups,ibrahimshbat/JGroups,pferraro/JGroups,tristantarrant/JGroups,rpelisse/JGroups,rhusar/JGroups,dimbleby/JGroups,tristantarrant/JGroups,pferraro/JGroups,ligzy/JGroups,pruivo/JGroups,danberindei/JGroups,pruivo/JGroups,danberindei/JGroups,deepnarsay/JGroups,kedzie/JGroups,Sanne/JGroups,slaskawi/JGroups,rhusar/JGroups,ibrahimshbat/JGroups,vjuranek/JGroups,kedzie/JGroups,rvansa/JGroups,deepnarsay/JGroups,kedzie/JGroups,dimbleby/JGroups,TarantulaTechnology/JGroups,belaban/JGroups,rvansa/JGroups,ligzy/JGroups,dimbleby/JGroups,rpelisse/JGroups,rpelisse/JGroups,ibrahimshbat/JGroups,rhusar/JGroups,danberindei/JGroups,ibrahimshbat/JGroups,belaban/JGroups,pferraro/JGroups,belaban/JGroups,ligzy/JGroups,vjuranek/JGroups,vjuranek/JGroups,pruivo/JGroups