Merge pull request #966 from tkafalas/feature

[BISERVER-10202/10203] Fix encoding when importing metadata.
Junit test fixes for DefaultUnifiedRepository to eliminate the
majority of test failures.