[BISERVER-10202/10203] Fix unit test failures related to MetadataImportHandler
Merge pull request #958 from tkafalas/5.0-feature

[BISERVER-10202/10203] Fix unit test failures related to MetadataImportHandler