integration stuff
Merge remote-tracking branch 'upstream/develop' into sam_raet_11

Conflicts:
	salt/daemons/__init__.py
Merge remote-tracking branch 'upstream/develop' into sam_raet_11
Merge pull request #10744 from SmithSamuelM/sam_raet_11

Sam raet 11  salt.daemons.IofloMaster and IofloMinion now work basically