[jboss-jira] [JBoss JIRA] Updated: (JGRP-940) MERGE: issue with merging