#29 Sync illumos-with-proper-idents branch with illumos/master

Update illumos-with-proper-idents branch - the branch subtrees were extracted from and merged to obtain !22 (merged).

Depends on !22 (merged).

Note: this should be a fast-forward merge (no merge commit), so merge it manually.