ISO 639 conversion fixes. Refs #5012, #5013.