Adding fixes for test-metadata build fail

JIRA - https://wso2.org/jira/browse/REGISTRY-2327