OS-2412 64-bit iconv modules should match 32-bit
Merge branch 'master' of git://github.com/joyent/illumos-extra into ec