Fixing SYNAPSE-933 Applying patch from Jeewantha with some changes

git-svn-id: https://svn.apache.org/repos/asf/synapse/trunk@1626115 13f79535-47bb-0310-9956-ffa450edef68