Cleanup the logic-- no reason to have so many negatives
Increase backoff each iteration by one up to syndic_wait as opposed to by one
Misc comment cleanup in tests
Spelling fixes for docs
Spelling
More spelling
More spelling
Fix for #16939

In the case that the master-master has no immediate downstream minions we were just incrementing the syndic_wait N times and then exiting, not pinging the lower level masters/minions. Now, I've consolidate the jinfo_timeout and timeout_at (since they were the same thing) and changed it to add syndic_wait to the timeout_at if you are a master-master, have more time to add, and would have timed out.
Cleanup logging output (to not be confusing)
Change syndic_wait in get_iter_returns

This will ensure we only do the quick return if you are *not* a syndic, since when you are a syndic we have no idea what the target is-- so we have to wait. This means that syndic masters (the master of masters) will have at least syndic_wait seconds until the return comes back
Fix typo
Add a default saltenv, to match the rest
Fix bug in grains outputter

The grain that sets the locale_info doesn't set it in the correct namespace (at least what everyone else including the tests are expecting). This means you get traces when you do a grains.setval something like:

```
[DEBUG   ] Traceback (most recent call last):
  File "/usr/lib/python2.6/site-packages/salt/output/__init__.py", line 36, in display_output
    display_data = get_printout(out, opts)(data).rstrip()
  File "/usr/lib/python2.6/site-packages/salt/output/grains.py", line 33, in output
    encoding = grains['locale_info']['defaultencoding']
KeyError: 'locale_info'
```
Revert spelling fix, since its a variable name :)
Revert naming here too
Merge pull request #16962 from jacksontj/2014.7

2014.7