Bug 6831 follow-up: add support for UNIMARC and NORMARC