BISERVER-8336 Import/Export locale fixes