Merge pull request #18084 from nmadhok/patch-1

Checking if exceptions module can be imported as it's removed from Python3
Merge pull request #18092 from CashStar/2014.7

fixing insert statement
Merge pull request #18101 from eliasp/2014.7-doc.topics.mine-mine_functions_example

Fix YAML syntax in mine_functions example.
Merge pull request #18102 from thatch45/isbm-btrfs-module

Merge #17282 with fixes
Merge pull request #18096 from gtmanfred/2014.7

add ability to configure config_drive
Merge branch '2014.7' into develop

Conflicts:
	salt/utils/__init__.py
Merge branch 'issue_17160' of https://github.com/cachedout/salt into cachedout-issue_17160
lint
Merge pull request #18104 from thatch45/cachedout-issue_17160

Merge #18070 with fixes
Merge pull request #18103 from rallytime/add_six_import

Don't remove six import, only disable for pylint
Merge branch 'sysctl-fixes' of https://github.com/oldmantaiter/salt into oldmantaiter-sysctl-fixes

Conflicts:
	salt/modules/netbsd_sysctl.py
Merge pull request #17964 from dmyerscough/fix-17198

Support multiple entries #17198
Revert "Making salt/_compat python3 compatible"
Merge pull request #18106 from saltstack/revert-18036-salt-python3-_compat

Revert "Making salt/_compat python3 compatible"
fix docs for filter_by arguments

It seems that ``base`` arg is only on Lithium (develop branch)
and the ``default`` arg was actually added on 2014.1.0.
This is particularly confusing because its usage is shown on formulas docs
as a best practice

http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#collecting-common-values
some lint disables for lint shortcomings wrt python six
Merge pull request #18108 from thatch45/lint_py3

some lint disables for lint shortcomings wrt python six
Fix up the linux_acl test that is failing
more lint
Merge pull request #18111 from slafs/grains-filterby-docfix

fix docs for filter_by arguments