Synchronize manifest template with illumos prototypes
Merge pull request #814 from mtelka/manifest-template

Synchronize manifest template with illumos prototypes