More nls refactoring and in the process fixing bug because EnumConstantNotPresentException was using a new 'luni.03' token but with the old message catalog.