OS-2412 64-bit iconv modules should match 32-bit