Merging Fixes for WSAS-1134 and WSAS-1160 to trunk

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