r11164: solaris packaging fixes