Updated consistent semantics for SaltEvent get_event factor
node is application kind which is provided by opts['__role']
the values of application kind are 'master, 'minion', 'syndic', 'call'
This allows RAETEvent to set up its lanename correctly
on a master the manor lanename is always 'master'
on a minion the manor lanename is derived from the opts['id']
In general opts should be passed to get_event when possible salt_cloud is the exception for now
This means that can never have two masters running on the same host unless all the directories are
made unique such as cachedir and sockdir
but multiple minions can run on the same host
fMerge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5

Conflicts:
	salt/daemons/flo/core.py
	salt/utils/raetevent.py
Merge pull request #16257 from SmithSamuelM/2014.7_sam5

Updated consistent semantics for SaltEvent get_event factor