Fixing STRATOS-893
Fixing STRATOS-889
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos