Merge "Update test expectation for IBM864 character set name."