[jboss-jira] [JBoss JIRA] Closed: (JBMESSAGING-678) Merge to trunk