Don't generate minion id by default
can't fix without changing API
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
Merge pull request #7740 from basepi/minioncaching

Actually pass minion_id to minion_id
Restore the pillar[master][file_roots] when returning the pillar
Fixed typos and bugs in hgfs. Fixes #7687
Fixed typo in comment
refer to appropriate class (self) in the Caller docstring
[3665] do not persist gitfs cache dir after config change/restart
Updated Sphinx makefile for latest Sphinx and i18n additions
Removed special case for uppercase attributes from Mock object

I'm not sure what the original intent of this behavior was but we don't
appear to be using it and it breaks the infinite chain-ability of the
Mock() object by not returning a chain-able object. E.g.:
``Mock().thing.thing.thing...`` works but ``Mock().thing.Thing.thing``
breaks.

Fixes #7725.
Prettify subcommand to kill minions

I realize that this is just cosmetic change. And possibly that there is
a compatibility issue, if minionswarm is to be used on platforms that
don't have pkill.
except right exception that file module raised
Explain why the pip state needs a pip module importable. Refs #7659.