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
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
Don't save non-matching events by default
Added support for reliable burst mode of udp packets. Add resend request from
messegnet to resend missed packets
Merge remote-tracking branch 'upstream/develop' into sam_raet_31
Merge pull request #11601 from SmithSamuelM/sam_raet_31

Added support for reliable burst mode of UDP packets when segmented
avoid shadowing in auth.ldap.groups()
avoid shadowing in modules.file.prepend()
Clean up some stats
rename refactor
Merge pull request #11605 from hulu/file-prepend-shadowing

avoid shadowing in modules.file.prepend()