Fixing issues relate to apimgt-greg integration.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@177884 a5903396-d722-0410-b921-86c7d4935375
committing patch for IDENTITY-1305

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