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