Merge pull request #7826 from s0undt3ch/0.17

0.17 Jinja unicode
Add missing import of OrderedDict
Set the 'pub_hwm' .get defaults to match the config default
Add markupsafe to requirements file because it is required for salt-ssh.
salt/utils/verify.py: rm trailing whitespace
utils/validate/net.py: simplify mac()

Also obviates a pylint warning:
salt/utils/validate/net.py:18: [W0311(bad-indentation), ] Bad indentation. Found 12 spaces, expected 8
fixes #7827 - String formatting is broken for mysql_grants.absent
Added self to AUTHORS.
Return None for the version and log a warning if the Postgres server cannot be reached. Refs #7695.
Fix incorrect versionadded directives

There is no release 0.17, the correct release number is 0.17.0.
Added salt.utils.validate to setup.py.

Conflicts:
	setup.py
Fix remove possible trailing slash in name of mounted state
Refreshed build instructions for Windows
Catch AttributeErrors and fall back to default outputter. Refs #7845.
Catch an error where salt-run might fail with a KeyError on master_uri. Thanks, Tom!
Make sure that ssh keys don't get added with incorrect encoding types.
Remove original return call
Give them both! This should make some cleaner middle ground here
Fix #7526

This should prevent already loaded mods from being reloaded from the
top level of the matches
Fix various pylint errors