Merge pull request #17946 from akshimassar/patch-1

Fix modules/iptables match-set parsing
Merge pull request #17951 from bersace/detect-qemu-system

Detect QEMU system from System manufacturer
Merge branch 'btrfs-module' of https://github.com/isbm/salt into isbm-btrfs-module
change license to be Apache in fsutils via ommision and lint

I kept the Suse copyright
Fix YAML syntax in mine_functions example.

The elements provided for a mine_functions definition need to be
either a list or a dict, but not a mix of both.
lint and style fixes
Merge pull request #17982 from nmadhok/cloud/clouds-python3-lxc

Making salt/cloud/clouds/lxc python3 compatible
Merge pull request #17961 from cachedout/issue_17955

Fix breakage caused by early function loading
Merge pull request #17952 from Unity-Technologies/osx-fix-run-as-user

Cherry picked: Fix salt.utils.chugid group_list filtering on OS X
Merge pull request #17987 from nmadhok/cloud/clouds-python3-ec2

Making salt/cloud/clouds/ec2 python3 compatible
Merge pull request #17992 from nmadhok/cloud/clouds-python3-aliyun

Making salt/cloud/clouds/aliyun python3 compatible
Remove duplicate code
Merge pull request #17994 from nmadhok/utils/serializers-python3-yaml

Making salt/utils/serializers/yaml python3 compatible
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