Porting fix from https://wso2.org/jira/browse/APIMANAGER-2256
Merge pull request #21 from raviu/master

Porting fix from https://wso2.org/jira/browse/APIMANAGER-2256