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

http://tickets.musicbrainz.org/browse/PICARD-539
Merge pull request #191 from zas/PICARD-539

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