Merge pull request #48 from dushansachinda/master

patched {https://wso2.org/jira/browse/ESBJAVA-3172}
Merge pull request #49 from dushansachinda/master

git revert changes made due to unit test failures
Merge remote-tracking branch 'wso2dev_synapse_upstream/master'
merged MSMP fix {https://wso2.org/jira/browse/ESBJAVA-3034}