First pass of changes for SmartOS esky packaging of 2014.7