[jboss-jira] [JBoss JIRA] Updated: (JGRP-937) MERGE4: get rid of shunning and use only merging (getting rid of shunfests)