adding tables to rectify test failure
Merge branch 'master' of https://github.com/wso2/carbon-apimgt
adding changes to remove use of apimgt.impl.internal modules in other apim components