salt-call/ssh, issue #16610:

Fix a regression when modules are called within an SLS
Merge pull request #16950 from Lacrymology/fix-module-run

backport regression fix from 2014.7