Fix #12137 where minions fail to perform a highstate when starting even when instructed
Fixed the docs for file.truncate so it actually reflects what it does.
Merge pull request #12146 from slai/develop

Fixed the docs for file.truncate so it actually reflects what it does
Change from master_job_caches to master_job_cache. If we want multiple returners we can create a returner that does that.
Add a multi_returner which will read/write from a list of returners
pylint cleanup
Move prep_jid into the returner interface
Move prep_jid into the returner interface
Merge branch 'job_cache' of github.com:jacksontj/salt into job_cache

Conflicts:
	salt/returners/local_cache.py
Add prep_jid to multi_returner
Make sure to save the load on minion returns from standalone jobs (e.g. salt-call)
Appease pylint :)
Save the load on the masterapi as well
Fix failing shell test case-- and change up jobs runner to use the "output" config instead of hard coding what the option should be. In addition i changed the display_output function to default the "out" to None, since that means "use config" down inside.
Merge pull request #12134 from cachedout/12131

Fix exception if no text is found to append
Fix the output now that we are using the default output (nested) instead of hard coding it to yaml
Replace string substitution with string formatting.
Fix anomalous back slash.
Use proper variable names for the exceptions.
Merge pull request #12148 from s0undt3ch/hotfix/jenkins

Several Lint Fixes