Merge pull request #7727 from feth/patch-1

fix zypper install interface (missing an escape)
Fix cli example of salt.modules.network.arp

Remove an useless '*' symbol in cli example of salt.modules.network.arp
Merge pull request #7728 from Lothiraldan/patch-1

Fix cli example of salt.modules.network.arp
salt-ssh: keep raw command to be executed remotely unexpanded, e.g.
          salt-ssh -r 'ls ~' won't be executed as 'ls /home/localuser',
          but correctly 'ls /home/remoteuser/'
Update tomcat.py

adjust the description for sphinx
Merge pull request #7732 from cssug/patch-1

Update tomcat.py
Make root_dir logic more robust/cross-platform
Merge pull request #7734 from basepi/minioncaching

Make root_dir logic more robust/cross-platform
Improved wonky overstate CLI example
Don't generate minion id by default
rename code:: to code-block::
Merge pull request #7731 from vvoody/fixed-raw-command-expanded

salt-ssh: keep raw command to be executed remotely unexpanded
Merge pull request #7736 from khrisrichardson/develop

rename code:: to code-block::
tomcat module: rm trailing whitespace
Merge pull request #7737 from cvrebert/patch-2

tomcat module: rm trailing whitespace
rm unused imports from states/win_system.py
Merge pull request #7738 from hulu/win-sys-unused-imports

rm unused imports from states/win_system.py
Have the minion actually generate its ID
Merge pull request #7739 from basepi/minioncaching

Make sure the minion ID is not guessed except by the actual minion
Fix typo