Fixing issues ESBJAVA-3298 and APIMANAGER-2830
Merge pull request #124 from chanakaudaya/master

Fixing issues ESBJAVA-3298 and APIMANAGER-2830