16110 Previously-hidden build race exposed with 11466
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

9997 Import iconv modules from g11n consolidation
Reviewed by: Andy Fiddaman <omnios@citrus-it.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>