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

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