Upcase constant
Fixed type-o
fix #7339
Adding versionadd's for salt cli ref and salt.states.file to denote some new 0.17 features

Conflicts:
	salt/states/file.py
fix missing man page for salt-ssh fixes #7042
Render errors are critical
Make systemd>=207 hosts use /etc/sysctl.d/99-salt.conf

As of systemd 207, /etc/sysctl.conf is now ignored, and
/etc/sysctl.d/*.conf are used. This commit makes linux hosts check to
see if they are running systemd, and for new enough versions it uses
/etc/sysctl.d/99-salt.conf for the default config file.

Conflicts:
	salt/states/sysctl.py
Add cleaner explanation of environment mapping

Explicitely state that the 'master' branch is automagically mapped
to the 'base' environment.

Also mention the fact that top.sls files are merged from the different
branches, which suggests a setup where top.sls is only present in
the 'master' branch.
Fixed pedantic spelling errors picked up by lintian

joe@unstable-builder:~/salt_017rc/salt$ lintian -I ../*.deb
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz specifed specified - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Targetting Targeting - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz targetted targeted - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Dependant Dependent - done
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57301 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57320 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57339 /var/named/ - not done - example
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz recieve receive - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dont don't - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz succesfully successfully - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz These package This package - not done - legitimate
fixed a typo accidently introduced
Added unit and integration tests for the file.replace functions
Added replace function to the file module
Added deprecated notices to all the sed functions
Minor faq fix (do -> don't)
Add git.current_branch.
Support branch matching in git.latest.
Added ext_pillar Django model field access through the ORM

This external pillar will load django model fields into pillar
data.
various style, spacing, spelling fixes to the file state
Enable PEP263 pylint plugin. Fixes #7294.