4295 libshare sa_get_proto_status sometimes returns unallocated strings
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Garrett D'Amore <garrett@damore.org>
4304 fmdump shall emit JSON
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Garrett D'Amore <garrett@damore.org>
4430 libuuid could cache /dev/random
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Dan McDonald <danmcd@omniti.com>
4195 snoop(1m) should print NFS_ACL mask in hex
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
4456 snoop(1m) should display remote RPC calls in summary mode
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@omniti.com>
4481 snoop(1m) does not decode time in GETTIME rpcbind operation
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@omniti.com>
4428 logadm ignoring -p flag
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Richard Lowe <richlowe@richlowe.net>
	[illumos-gate merge]

commit 34969e746608c8170ab540c876836f625f25d8eb
    4428 logadm ignoring -p flag
commit c64d0c7c2b822e28df7036ee627f438587d05037
    4481 snoop(1m) does not decode time in GETTIME rpcbind operation
commit 78fb3df6a49cd4598f9bba9960558158f7ec440a
    4456 snoop(1m) should display remote RPC calls in summary mode
commit 023efabbe28d70d797973d99bf36d5552c2a8cb8
    4195 snoop(1m) should print NFS_ACL mask in hex
commit 84615402a46a91be66843bd64e4fb72642b06e9d
    4430 libuuid could cache /dev/random
commit 2db6d663182655cb393dc2c15668bc9293364594
    4304 fmdump shall emit JSON
commit 652601fb657e961ff66dadcd87ddfc146c5db0ca
    4295 libshare sa_get_proto_status sometimes returns unallocated strings

Conflicts:
	usr/src/lib/libuuid/common/uuid.c
	usr/src/lib/libshare/smb/libshare_smb.c
	usr/src/lib/libshare/autofs/libshare_autofs.c
	usr/src/lib/libnvpair/nvpair_json.c
	usr/src/cmd/logadm/conf.c