[esb-issues] [JBoss JIRA] (JBESB-3906) Merge JBESB-3898 into JBESB_4_11_CP2 branch