10805 Fix for 10687 can be improved
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>

10686 Debug macros causes smatch issues
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@joyent.com>

OpenSolaris Launch