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

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