Adding Greg nested feature categories

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@180113 a5903396-d722-0410-b921-86c7d4935375
changed key store, keystore to KeyStore

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