Preparation for salt-call on Raet to set up ioflo caller stacks
Moved the APPL_KINDS to util.kinds to avoid circular import
changed call kind to caller
Attempt to make salt-call work with multi-master by picking a default master
for when the route destination estate is not specified
Changed log level of a couple of messages
tests/unit/utils/event_test.py: fix typo in comment
Merge pull request #17197 from cvrebert/patch-1

tests/unit/utils/event_test.py: fix typo in comment
pillar/file_tree.py: fix typo: "paramater" [sic]
Merge pull request #17199 from cvrebert/patch-1

pillar/file_tree.py: fix typo: "paramater" [sic]
fix a "typo"
Merge pull request #17201 from mgwilliams/sdb_memcache

memcached sdb module - it's not "Salt DB"
Correct data in /srv/reactor/startup_highstate.sls

data['id'] does not exist; data['name'] does. revise example sls to render correctly.
Change raetevent.SaltEvent to RAETEvent to be less confusing
Change rejected for multimaster
Merge pull request #17206 from arubis/patch-2

Correct data in /srv/reactor/startup_highstate.sls
Freeze the testing runtime configs at a latter stage
Merge pull request #17213 from s0undt3ch/hotfix/freeze-configs-delayed

Freeze the testing runtime configs at a latter stage
Merge branch '2014.7' into develop
Merge pull request #17214 from s0undt3ch/develop

Merge branch '2014.7' forward into develop
fixed typo bug
fixed lint errors
Merge remote-tracking branch 'upstream/develop' into sam_call1

Conflicts:
	salt/daemons/flo/core.py
Fixed merge conflicts that were auto merged
incompatible changes