backport smartos esky improvments to 2014.1

Backport of three SmartOS esky improvements I'd been manually applying when running builds.
Better to have them actually in the branch.