Reverting some configs committed

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@187389 a5903396-d722-0410-b921-86c7d4935375
Applying patch from SumedhaS for CLOUD-7

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