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
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
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.
another error wording fix
reported upstream
reported upstream
Also require git CLI command when verifying gitpython

We can't be certain that packages have proper dependencies
Adding a prepend function to the file module and state.  Functions similar to the append function but prepends provided text to the beginning of the provided file.
fix typo in docstring for utils.event.get_event()
Fix IPv6 sockaddr unpacking in utils.network.host_to_ip()

Per http://docs.python.org/2/library/socket.html#socket.getaddrinfo :
> sockaddr is [...] a (address, port, flow info, scope id) **4**-tuple for AF_INET6
Merge pull request #11565 from cvrebert/patch-1

fix typo in docstring for utils.event.get_event()
Merge pull request #11567 from hulu/ipv6

Fix IPv6 sockaddr unpacking in utils.network.host_to_ip()