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

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