Backport  #14022 and #14156 onto the 2014.1 branch

This should be tested by end users before it's merged.

Standalone Tarball: https://us-east.manta.joyent.com/nahamu/public/salt/testing/salt-2014.1.7-10-g579cc0a-esky-smartos.tar.gz
Esky Zip: https://us-east.manta.joyent.com/nahamu/public/salt/testing/salt-2014.1.7-10-g579cc0a.solaris-2_11-i86pc_64bit.zip

I'd like @johngrasty and one of @njones11 or @zmcneilly to test it.
I would like signoff from both @johngrasty and @YanChii on my cleanup.

After testing and approval of my cleanup I'll open a PR against develop for a similar cleanup.