Include 3D GPUs in GPU grain data

Fixes #15547.
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
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.
Merge branch '2014.7' into develop