possible fix for https://github.com/saltstack/salt/issues/5567
possible fix for https://github.com/saltstack/salt/issues/5567
Remove unnecessary variables.

Somewhere along the way salt's setup changed and some variable were left around. Let's remove them.
Make pylint happy, global variables are all uppercased.
Allow salt's paths to be configurable at build time.
Double to single quotes.
Minor formatting updates.
No more hard-coded salt paths.

All system paths that salt expects and needs are all configurable at install time. This allows for packagers to setup salt's **default** internal paths at build time. For example, under windows, the configuration directory is expected at `c:\salt\conf\`, on FreeBSD at `/usr/local/etc/salt`, etc.

The configurable paths are:

* Salt root directory, `salt_root` in the master and minion configuration files, `--salt-root-dir` option to `python setup.py install`.  Default: `/`
* Salt configuration directory, `--salt-config-dir` option to `python setup.py install`.  Default: `/etc/salt`
* Salt cache directory, `--salt-cache-dir` option to `python setup.py install`.  Default: `/var/cache/salt`
* Salt sock directory, `--salt-sock-dir` option to `python setup.py install`.  Default: `/var/run/salt`
* Salt services root directory, `--salt-srv-root-dir` option to `python setup.py install`.  Default: `/srv`
* Salt base file roots directory, `--salt-base-file-roots-dir` option to `python setup.py install`.  Default: `/srv/salt`
* Salt base pillar roots directory, `--salt-base-pillar-roots-dir` option to `python setup.py install`.  Default: `/srv/pillar`
* Salt base master roots directory, `--salt-base-master-roots-dir` option to `python setup.py install`.  Default: `/srv/salt-master`
* Salt logs directory, `--salt-logs-dir` option to `python setup.py install`.  Default: `/var/log/salt`
* Salt pidfile directory, `--salt-pidfile-dir` option to `python setup.py install`.  Default: `/var/run`
wrap match name in quote to make sure it work
Allow tests to be properly skipped if `mock` is not installed.
Fix test expected output plus an additional one for pip git install.
Merge pull request #6902 from hvnsweeting/fix_overstate

wrap match name in quote to make sure it work
Merge pull request #6899 from s0undt3ch/hotfix/mock-not-available

Allow tests to be properly skipped if `mock` is not installed
Merge pull request #6890 from s0undt3ch/features/improve-packaging

Improve packaging - No more hardcoded internal paths
Add doc showing how to install a Salt Master
Merge pull request #6903 from UtahDave/develop

Add doc showing how to install a Salt Master
Merge branch 'develop' of git://github.com/foxx/salt into foxx-develop

Conflicts:
	salt/utils/timed_subprocess.py