[illumos-gate merge] (update manifest)