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

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