Fix naming of manifest file in SmartOS
Merge branch 'master' into jem-smartos-runner-patches