Fix debug code snafu in boto_sqs module
more clarification/info on dunder objects
tweak wording
Merge pull request #12126 from terminalmage/docs

more clarification/info on dunder objects
Detect changed mount options and remount if necessary.
Ensure that the 'id' grain available to pillar is valid
Pylint
Merge pull request #12129 from cachedout/6079

Disk mounting improvements and bug fixes
Misc rST fixes
Try to create a file when appending if it doesn't exist.
Major rework of the master job cache. This moves the local cache on the master off into a returner (local_cache) and changes everyone to use that interface.
add modules locale.avail and gen_locale
Move the job cleanup into the returner
added locale.present state
Move the .p file names into global variables within the module-- so they are in one place
Fix exception if no text is found to append
Consolidate job dir into a private function
Merge branch 'job_cache' of github.com:jacksontj/salt into job_cache

Conflicts:
	salt/runners/jobs.py
Fix comment
Remove local jid_dir override from testing