Make salt cli return a non-zero error code if an error occurred
Fix failing test
Merge pull request #18918 from cachedout/salt_cli_retcode

Make salt cli return a non-zero error code if an error occurred