Merge pull request #954 from tkafalas/feature

[BISERVER-10202/10203] Changes to import allow DSW metadata files to be
[BISERVER-10202/10203] Fix unit test failures related to MetadataImportHandler