4622 asy.conf interrupt configuration broken
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@omniti.com>
4573 ZFS snapshot alias
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>
	[illumos-gate merge]

commit 7dbbcd8300f0241d3ec9686f2a0a06107c1b90cb
    4573 ZFS snapshot alias
commit 709ee7cac5ff7cd991f4b21face672a23a7409a5
    4622 asy.conf interrupt configuration broken