merging r173937 and r175018 from branch

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@175195 a5903396-d722-0410-b921-86c7d4935375