merged {https://wso2.org/jira/browse/ESBJAVA-3011}
Merge remote-tracking branch 'wso2dev_mediation_upstream/master'
Merge pull request #32 from dushansachinda/master

merged {https://wso2.org/jira/browse/ESBJAVA-3011}