PICARD-539: ensure we append preferred encoding to normalized locale

http://tickets.musicbrainz.org/browse/PICARD-539