fix volumes_from mismatch in docstring

s/dns/volumes_from/
SmartOS esky: build needs to invoke sdist

per saltstack/salt#15405
Pylint fix
Add state.pkg to highstate outputters
Work around esoteric bug in reload of site package

Fixes #15647
Merge pull request #15668 from nshalman/esky-sdist-2014.7

SmartOS esky: build needs to invoke sdist
Merge pull request #15658 from bbinet/volumes_from-docfix

fix volumes_from mismatch in docstring
Merge pull request #15677 from thatch45/ssh_out

Add state.pkg to highstate outputters
Merge pull request #15675 from rallytime/pylinting

Pylint fix
Merge pull request #15678 from cachedout/issue_15647

Work around esoteric bug in reload of site package
Fix typo in comment
Merge pull request #15708 from s0undt3ch/2014.7

Fix typo in comment
Merge branch '2014.7' into develop