Merge pull request #10302 from gtmanfred/develop

[salt] need the extra space
[salt] add cp.push_dir

I want to be able to push full directories to the master recursively.