forward-ported from the 2.6.merge branch
forward-ported from the 2.6.merge branch

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