Normalize cleanup and return routines for state wrappers in salt-ssh
Merge pull request #18747 from basepi/saltssh-state-cleanupfix

[2014.7] Normalize cleanup and return routines for state wrappers in salt-ssh