fix regression introduced by #11057
grammar
Merge pull request #11064 from makinacorpus/hotfix3

fix regression introduced by #11057
Don't redefine deploy_script
Merge pull request #11066 from techhat/bootstrap

Don't redefine deploy_script
lint fix
Added a note regarding creates and what versions it is supported in.
Merge remote branch 'upstream/develop' into develop
Merge pull request #11067 from gravyboat/develop

Update to cmd state documentation for a note on creates.
Add survey to runner index
Merge pull request #11068 from holmboe/survey-runner-index

Add survey to runner index
Compare to `None` instead.

Which is what's returned by `salt.utils.which` in case the binary is not
found.
Update doc to reflect proper `__virtual__` usage.
Show how to use `__virtualname__`
Merge pull request #11069 from s0undt3ch/hotfix/minor

Minor corrections
salt.cloud.lxc: Optimized salt client
Safebelts for lxc provisionning:

Cloud:
    - Allow to use alternate config prefixes
    - Filter default options

LXC module:
    - Filter default options in create
salt.cloud.lxc: Optimized salt client
Safebelts for lxc provisionning:

Cloud:
    - Allow to use alternate config prefixes
    - Filter default options

LXC module:
    - Filter default options in create
Merge branch 'lxc' into develop