4586 dhcpv6 client id malformed
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Dan McDonald <danmcd@omniti.com>
4655 add %Z corefile name pattern for zonepath
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
	[illumos-gate merge]

commit e6163a885dbd739e5a60eaa05eafd2d831631bfd
    4655 add %Z corefile name pattern for zonepath
commit 35b6f0471a5d938b98734483be3c5a258e319010
    4586 dhcpv6 client id malformed

Conflict:
	usr/src/uts/common/os/core.c