Clean up majority of deprecation warnings from salt cli tools passing kwargs as yamld strings
Clean up comment
Pep8 cleanup
Merge pull request #10880 from jacksontj/argkwarg

Clean up deprecation warnings about arg/kwarg passing