saltstack/salt — pull request #14501 by nshalman (2014-07-25 19:03:23+00:00)
Title: 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.