Committing the fixes done for ESBJAVA-3411