[jboss-jira] [JBoss JIRA] Updated: (JGRP-1026) Harden merge