BISERVER-8336 Import/Export locale fixes
Merge pull request #350 from tkafalas/feature

BISERVER-8336 Import/Export locale fixes