Applying patch for WSAS-1308. Thanks Piyum for the contribution

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

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@178067 a5903396-d722-0410-b921-86c7d4935375
adding missed merge to trunk by ishan. Commit to branch is r176729

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

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