Merge pull request #11554 from makinacorpus/overlayfs

unjustified restriction over snapshoting over overlayfs
Merge pull request #11558 from terminalmage/issue11347

Make gitfs_base configurable on a per-repo basis
Merge pull request #11564 from garethgreenaway/file-prepend

Adding a prepend function to the file module and state
Merge pull request #11513 from pass-by-value/document_output_color_codes

Add a note about outputter color codes
Merge pull request #11547 from ze42/dev_grains_setvals

modules.grains: setvals
A little mor clarity
lint
Move the call to write the /etc/default/networking file into the if loop.  Since Ubuntu 12.04+ doesn't use this file anymore, we don't want to write the file there, but want to write it if the system is a Debian system or older than Ubuntu 12.04
Merge pull request #11587 from garethgreenaway/develop

Move the call to write the /etc/default/networking file into the if loop
Actually log the LDAP traceback
Merge pull request #11590 from whiteinge/ldap-log-traceback

Actually log the LDAP traceback
Made the salt-ssh shim run on Solaris 10.
Merge branch 'develop' of github.com:saltstack/salt into salt-ssh-solaris-support
Replaced Lanyrd embed with link to events page
cloud.lxc: as it is a one minion thing, use list to speed up
Added functionality to sysctl.persist and integration tests for darwin_sysctl module
Removed broken_links.txt accidentally committed

Accidentally committed by some *doofus* in 86e0075.
Merge pull request #11591 from chevah/salt-ssh-solaris-support

Made the salt-ssh shim run on Solaris 10.
Merge pull request #11593 from makinacorpus/hf2

cloud.lxc: as it is a one minion thing, use list to speed up
Merge pull request #11594 from rallytime/darwin_sysctl_test

Tests and added functionality for darwin_sysctl module