1.) in order to fix macosx uninstaller tool build ICONV needs to be restored in makefiles. (It was previously only used by deploy - but now also used by macosx uninstaller tool).
2.) IBTOOL was only partially restored by JDK-8200448
2.) IBTOOL was only partially restored by JDK-8200448