Fixing regression issues caused by r178674 and r178120 - merging branch fix r181920

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@181921 a5903396-d722-0410-b921-86c7d4935375
Add resources for tests

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