Clean up majority of deprecation warnings from salt cli tools passing kwargs as yamld strings