Include 3D GPUs in GPU grain data

Fixes #15547.
fix volumes_from mismatch in docstring

s/dns/volumes_from/
Merge pull request #15639 from terminalmage/fix-gpu-grains

Include 3D GPUs in GPU grain data
Fix error where mods was not cleanly a dict
SmartOS esky: build needs to invoke sdist

per saltstack/salt#15405
fix bad recursive json render
pass in the right field....
don't try to use the passed in outputter with metadata request

in salt-ssh
Don't open module dirs; just files.

Fixes bug in salt-ssh that prevents it from working when nested dirs
exist under /srv/salt/_modules. Closes #15671.
Kill print line
Merge pull request #15674 from thatch45/ssh_fixes

Ssh fixes
Merge pull request #15672 from cachedout/issue_15671

Don't open module dirs; just files.
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