re-applying JGroups fix after fixing test