fixed issue reported {https://wso2.org/jira/browse/ESBJAVA-3151}
Merge pull request #47 from dushansachinda/master

fixed issue reported {https://wso2.org/jira/browse/ESBJAVA-3151}
patched {https://wso2.org/jira/browse/ESBJAVA-3172}
Merge pull request #48 from dushansachinda/master

patched {https://wso2.org/jira/browse/ESBJAVA-3172}
git revert changes made due to unit test failures
{{https://wso2.org/jira/browse/ESBJAVA-3172}
Merge pull request #49 from dushansachinda/master

git revert changes made due to unit test failures