Fixing ESBJAVA-3079
Merge pull request #29 from dushansachinda/master

Applied patch {https://wso2.org/jira/browse/ESBJAVA-3096}
Merge pull request #22 from johannnallathamby/master

Fixing ESBJAVA-3079
Merge remote-tracking branch 'wso2dev_mediation_upstream/master'