Fixing server startup issue

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@177242 a5903396-d722-0410-b921-86c7d4935375
Fixing server startup issue

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@177243 a5903396-d722-0410-b921-86c7d4935375
Fixing server startup issue

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@177245 a5903396-d722-0410-b921-86c7d4935375
Fixing server startup issue

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

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