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
Merge branch 'develop' of github.com:saltstack/salt into salt-ssh-solaris-support