possible fix for https://github.com/saltstack/salt/issues/5567
possible fix for https://github.com/saltstack/salt/issues/5567
Add salt.utils.master with class MasterPillarUtil. Change salt.runners.cache to use salt.utils.master.MasterPillarUtil
Added 'kind' field to minion.py fire_master so can show namespaced minion and syndic events. Also
fixed master.py so uses normalized convention for showing namespaced events from minion events
Merge remote-tracking branch 'upstream/develop' into develop
Added syndic as a tag prefix type
Fixed sub events from minion to master and from syndic to master to namespace better.
Changed _fire_master to add pretag parameter so events from syndic to master can get duplicated with salt.syndic.sid.event
name spaced so one can see name spaced events as they bubble up through syndics
Pretag is syndic not salt.syndic on events
Remove unnecessary variables.

Somewhere along the way salt's setup changed and some variable were left around. Let's remove them.
Added fields to sub event data to enable normalized processing of events
Make pylint happy, global variables are all uppercased.
Allow salt's paths to be configurable at build time.
supporting tomcat6
less copy/paste
Merge pull request #6839 from SmithSamuelM/develop

Support for normalized namespaced minion and syndic events
Docs formatting fixes
Merge pull request #6883 from terminalmage/docs

Docs formatting fixes
Fix boolean, plus other pep8 fixes

b9e7567b used "false" instead of "False", this fixes that.
Clarify OS X instructions toward success
Merge pull request #6885 from lloydchang/develop

Clarify OS X instructions toward success
fixed service comment text