show_timeouts, new default
Fix #15170 - keep comments within the hosts file
Fix esky builds when using setuptools
Fix missing args issue in mine.send

Resolves #15309

mine.send was not functional for any function which didn't contain
defined arguments.

This forcibly packs those into the function call if they aren't
detected. I'm not totally convinced this is the best way to do this, so
other approaches are welcome.
Turn down warning.

See discussion here:
https://github.com/cachedout/salt/commit/6fce06c6606c7caa079a82bcfb40083b94009ce0
init pubkey support for linode
fix missing newlines
Don't return multiple elements for grain 'osmajorrelease'.

Before this fix, the output of the 'osmajorrelease' grain looked like
this:

    osmajorrelease:
        7
        0.1406

Now it'll only return the actual major release number:

    osmajorrelease: 7
document possibility of ssh_pubkey
Added instructions on how to back-port fixes to release branches
add get_priv_key_filename()
fix missing )
remove extraneous ))
document new ssh_private_key config value
s/ssh_private_key/ssh_key_file
also update other linode config doc
fix pylint errors
zfs doesn't support help as parameter. Changed with a question mark.
STY: Refactored common code in salt.module.pip to make it easier to maintain and simplify the code
caches.{fscache,fsworker}: put __main__ code into funcs to avoid var shadowing

************* Module salt.caches.fscache
salt/caches/fscache.py:24: [W0621(redefined-outer-name), FSTimer.__init__] Redefining name 'opts' from outer scope (line 276)
salt/caches/fscache.py:61: [W0621(redefined-outer-name), FSCache.__init__] Redefining name 'opts' from outer scope (line 276)
************* Module salt.caches.fsworker
salt/caches/fsworker.py:111: [W0621(redefined-outer-name), FSWorker.run] Redefining name 'context' from outer scope (line 145)