Merge branch 'master' into markj-develop

Conflicts:
	cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
	cddl/lib/libdtrace/psinfo.d
	sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
	sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
Left a merge marker in the code.