Fix broken tests
This time I banged my head on the table extra-hard.
Copy&Paste error

It's `timeout` not `tmo` in this if clause.
Problem was actually with the ext grains. Doh!
More requisite doc cleanup
Merge pull request #13267 from d--j/patch-2

Copy&Paste error in error message
Merge pull request #13268 from basepi/requisitedocs

More requisite doc cleanup
Remove trailing white-space
Fix missing line lint issue
Fix indentation
Remove extra space
Don't hard code paths
Remove trailing white-sapce
Fix variable name
Merge pull request #13261 from cachedout/10275

Detection of __salt__ in loader
Merge pull request #13269 from s0undt3ch/hotfix/lint

Lint fixes + no hardcoded paths
optionally get etcd vals from master, squash stack traces, and fix lint issues
Clarify yaml indentation issues, and add another example
Merge pull request #13271 from basepi/yamlindentation

Clarify yaml indentation issues, and add another example
Stop complaining about PEP8 E265