Merge pull request #18005 from nmadhok/daemons/test-python3-test_raetkey

Making salt/daemons/test/test_raetkey python3 compatible
Merge pull request #18006 from nmadhok/daemons/test-python3-test_multimaster

Making salt/daemons/test/test_multimaster python3 compatible
Merge pull request #18036 from nmadhok/salt-python3-_compat

Making salt/_compat python3 compatible
Merge pull request #18040 from chulkilee/rbenv-ruby-version

Respect ruby when using gem with rbenv
Merge pull request #18043 from jfindlay/update_unit_test_docs

Update unit test docs
Merge pull request #18049 from ze42/netbsd_sysctl

bugfixes: netbsd_sysctl
Don't remove six import, only disable for pylint
Merge pull request #18062 from jacksontj/2014.7

An additional fix for #17080
Merge pull request #18069 from tehmaspc/tehmaspc_typo_fix_cloud_config

Typo fix and formatting
Merge pull request #18075 from whiteinge/doc-file.replace-escaping

Added note to file.replace about avoiding quoting and escaping in YAML
Merge pull request #18076 from UtahDave/develop

add additional repository command
Merge pull request #18082 from clan/extfs

extfs: skip 'Group descriptor size'
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