Fixing the JIRA APIMANAGER-2830 and ESBJAVA-3298