CHEF-2576 - SmartOS bits
Merge remote-tracking branch 'remote/CHEF-2576'