Merge "Clean up Hyphenator file reading" into mnc-dev