Merge pull request #37681 from rallytime/bp-35965

Back-port #35965 to 2016.3

salt/client/ssh/wrapper/state.py

@@ -327,6 +327,7 @@ def highstate(test=None, **kwargs):
     # Check for errors
     for chunk in chunks:
         if not isinstance(chunk, dict):
+            __context__['retcode'] = 1
             return chunks
     # Create the tar containing the state pkg and relevant files.
     trans_tar = salt.client.ssh.state.prep_trans_tar(