[esb-issues] [JBoss JIRA] (JBESB-3720) Merge changes for JBESB-3712 to GSS-SOA-3619 branch