OS-2456 sd timeout/retry settings are absurd
OS-2432 tail -f/-F missing some truncation events
OS-2433 tail -f/-F can produce duplicate output after a truncation
OS-2437 arc_get_data_buf() blocks in vmem_alloc() instead of evicting
4111 wcwidth() still not right for some characters
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
	[illumos-gate merge]

commit 33cf071bf2879e2693faa899bc1c16776dcbf897
    4111 wcwidth() still not right for some characters
OS-2469 missing fm driver prevents all CPU and memory diagnosis on all HW
4099 SMF methods without absolute paths no longer work
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@nexenta.com>
4020 Make ldi_ev_remove_callbacks safe to use in LDI callbacks
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
	[illumos-gate merge]

commit 52e13e00baadc11c135170cd60a8b3c4f253a694
    4099 SMF methods without absolute paths no longer work
3806 illumos build execs echo unnecessarily
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
3737 grep does not support -H option
3759 egrep(1) and fgrep(1) -s flag does not hide -c output
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
	[illumos-gate merge]

commit 41599e9fdccb44cc5f17828ab04b3147cefcc4e0
    3737 grep does not support -H option
    3759 egrep(1) and fgrep(1) -s flag does not hide -c output
commit ea76c26cbb46a2abd6ae5d4bdfaa26e32a405633
    3806 illumos build execs echo unnecessarily
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec