more lint
Merge pull request #18111 from slafs/grains-filterby-docfix

fix docs for filter_by arguments
Merge pull request #18110 from rallytime/fix_linx_acl_test

Fix up the linux_acl test that is failing
Add CLI example to btrfs.version
Merge pull request #18105 from thatch45/oldmantaiter-sysctl-fixes

Merge #18079
Remove timeout from runner disbatch
Adds param to def create_attach_volume (wait_to_finish), default to true, as you can't attach a newly created volume unless it's available
Increase timeout from 5s to 10s, since jenkins seems to have issues calling runners in 5s
Added special branch '_' in git_pillar to match saltenv
base arg should be a key (string) of the given dict
Merge pull request #18122 from slafs/formula-docfix

small doc fix
Merge pull request #18112 from rallytime/cli_example

Add CLI example to btrfs.version
btrfs module: use new-style except-as syntax
Merge pull request #18125 from cvrebert/patch-1

btrfs module: use new-style except-as syntax
Add insecure_registry to docker.pull and docker.push

This parameter works with docker-py >= 0.5.0 and allow for non HTTPS
registries
Add insecure_registry to docker state
Added docker cpu params
Let zypper module ignore apt-specific option 'ppa_auth'
Fix requirements - six is actually required for modules/zypper.py
Remove heading from top-level docstrings

It makes sphinx's autosummary look off by showing up in the summary
text. For example:

http://docs.saltstack.com/en/latest/ref/modules/all/index.html