4964 nl_langinfo(CRNCYSTR) returns wrong alignment character
4999 libc test suite enhancements
4939 desire wcsnrtombs() function
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
2964 need POSIX 2008 locale object support (fix gcc)
5002 Possible buffer overflow in makefh3()
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Robert Mustacchi <rm@joyent.com>
2964 need POSIX 2008 locale object support (more C++ fixes)
	[illumos-gate merge]

commit 732efd5515b5788339f3da4db04de7cea0f79c86
    2964 need POSIX 2008 locale object support (more C++ fixes)
commit fec13dd95833a1b958477320d32721f886a94f50
    5002 Possible buffer overflow in makefh3()
commit 0934fbd7017fd0754831e0ab14cdfc897809b881
    2964 need POSIX 2008 locale object support (fix gcc)
commit 538aa54d819fa7751ca82bcc30d4ed8c57ec2ef2
    4964 nl_langinfo(CRNCYSTR) returns wrong alignment character
    4999 libc test suite enhancements
    4939 desire wcsnrtombs() function

Manifests:
	usr/src/pkg/manifests/system-library.man3c.inc
OS-3068 libnvpair JSON output broken by lint fixes
OS-3204 libnvpair JSON cannot print int16 arrays
Reviewed by: Robert Mustacchi <rm@joyent.com>
5003 want kstats for per-zone cpu usage
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Richard Elling <richard.elling@gmail.com>
Approved by: Rich Lowe <richlowe@richlowe.net>
4998 add libdiskmgt spec as block comment
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>
4994 nlm_register_lock_locally() fails to unlock held locks
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Richard Lowe <richlowe@richlowe.net>
4995 panic in nlm_prog_4
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Richard Lowe <richlowe@richlowe.net>
4958 zdb trips assert on pools with ashift >= 0xe
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
OS-3149 lx brand always sends SIGCHLD to parent processes, regardless of how clone was invoked
OS-2887 lxbrand add WALL, WCLONE, WNOTHREAD support to waitid
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
4631 zvol_get_stats triggering too many reads
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
OS-3215 32bit syscalls with more than 6 parameters re-use arg0/arg1 as arg6/arg7
OS-3217 brandsys syscall takes 7 parameters, not 6
4753 increase number of outstanding async writes when sync task is waiting
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Garrett D'Amore <garrett@damore.org>
	[illumos-gate merge]

commit 73527f441cbbd953fa42cc5a30a413bad75f24a9
    4753 increase number of outstanding async writes when sync task is waiting
commit bbfa8ea8bb4168c969ba27d632dfe0aeec3fc0da
    4631 zvol_get_stats triggering too many reads
commit 2a104a5236475eb73aa41eaaf3ed9f3ccbe0ca55
    4958 zdb trips assert on pools with ashift >= 0xe
commit b4ecf764d8099c92d5c9c0f13a45514377f3d292
    4995 panic in nlm_prog_4
commit 5cd496e3c5514951ae23bdd897cb29b202e2ff62
    4994 nlm_register_lock_locally() fails to unlock held locks
commit 542a813c9f6736dc348fecc7244bf22b4e0a319c
    5003 want kstats for per-zone cpu usage

Conflicts:
	usr/src/uts/common/sys/zone.h
	usr/src/uts/common/os/zone.c
	usr/src/uts/common/klm/nlm_service.c
	usr/src/uts/common/fs/zfs/metaslab.c
OS-3216 lxbrand invoke sdt probe for unsupported kernel emulation
5008 lock contention (rrw_exit) while running a read only load
Reviewed by: Matthew Ahrens <matthew.ahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Alex Reece <alex.reece@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Richard Yao <ryao@gentoo.org>
Reviewed by: Saso Kiselkov <skiselkov.ml@gmail.com>
Approved by: Garrett D'Amore <garrett@damore.org>
OS-3206 lx brand code at a possibly unreached point in clone.c