2915 DTrace in a zone should see "cpu", "curpsinfo", et al
2916 DTrace in a zone should be able to access fds[]
2917 DTrace in a zone should have limited provider access
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4477 DTrace should speak JSON
Reviewed by: Bryan Cantrill <bmc@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4474 DTrace Userland CTF Support
4475 DTrace userland Keyword
4476 DTrace tests should be better citizens
4479 pid provider types
4480 dof emulation is missing checks
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4471 DTrace count() with histogram
4472 DTrace full width distribution histograms
4473 DTrace frequency trails
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4159 dtrace ignores all ustack helper frames from dead processes
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4478 dtrace_dof_maxsize is far too small
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4470 overly aggressive D integer narrowing breaks 32-bit ustack helpers
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4469 DTrace helper tracing should be dynamic
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
4626 libzfs memleak in zpool_in_use()
Reviewed by: Tony Nguyen <tony.nguyen@nexenta.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
	[illumos-gate merge]

commit fb13f48f1d9593453b94cd1c7277553b56f493c8
    4626 libzfs memleak in zpool_in_use()
commit 902686d13f8a39cfdc57f5605470369eafa51e1f
    4469 DTrace helper tracing should be dynamic
commit 2e0552679e3175533ade93573ac1229d20a8367b
    4470 overly aggressive D integer narrowing breaks 32-bit ustack helpers
commit d339a29bb4765c4b6883a935cf69b669cd05bca0
    4478 dtrace_dof_maxsize is far too small
commit 33093f5bcdc51014933497dd39374080c1ac5705
    4471 DTrace count() with histogram
    4472 DTrace full width distribution histograms
    4473 DTrace frequency trails
commit a386cc11a86ecb60f5a48078d22c1500e2ad003e
    4474 DTrace Userland CTF Support
    4475 DTrace userland Keyword
    4476 DTrace tests should be better citizens
    4479 pid provider types
    4480 dof emulation is missing checks
commit f497f9fe231e0e400f339c84a7d80c4aae2ac4d5
    4477 DTrace should speak JSON
commit b0f673c4626e4cb1db7785287eaeed2731dfefe8
    2915 DTrace in a zone should see "cpu", "curpsinfo", et al
    2916 DTrace in a zone should be able to access fds[]
    2917 DTrace in a zone should have limited provider access

Conflicts:
	usr/src/uts/common/sys/zone.h (memory capping)
	usr/src/lib/libdtrace/common/dt_open.c
	usr/src/lib/libdtrace/common/dt_error.c
	usr/src/lib/libdtrace/common/dt_consume.c
	usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
	usr/src/cmd/dtrace/test/tst/common/privs/tst.procpriv.ksh
	usr/src/cmd/dtrace/test/tst/common/privs/tst.getf.ksh
	usr/src/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d
	usr/src/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out
	usr/src/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d
	usr/src/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh