salt.modules.lxc: actually use custom nic_opts
Merge branch 'develop' into lxc
Add a note about outputter color codes
modules.grains: setvals

Set multiple grains at once
grains.setval: avoid code duplication

setval calls setvals to avoid duplicating code
Whitespace
Fixes reference to ssh-id-wrapper script
Merge pull request #11550 from bretep/fix-ssh-id-wrapper-path

Fixes reference to ssh-id-wrapper script
Let os.path.join do it's job.

Remove forward slash so that the path will be built
correctly.
unjustified restriction over snapshoting over overlayfs
Fix error wording

Use 'saltenv' instead of 'environment'
Make gitfs_base configurable on a per-repo basis

Also fixed a regression, present only in the develop branch, where
ordering of gitfs remotes was not preserved.
Add info on per-remote gitfs_base to master docs
Don't load on Windows systems.

Fixes #11555
Merge pull request #11556 from UtahDave/develop

Don't load on Windows systems.
Fix 3835d30096a92c28aa19ae18114d6a4262748742

This commit breaks gitfs for non-gitpython providers, fixed the source
of the URI for the log message. Also simplified logic from this commit.
use __virtualname__
Merge pull request #11557 from UtahDave/develop

use __virtualname__
Don't log in __virtual__ function.

Use __virtualname__ as well.
don't log anything in __virtual__ functions