Snapshot 2018.04

illumos-gate:

Userland:

IPS / pkg5:
Build system changes: