Add snippet to disable dhclient resolvconf hook if it exists.
Merge remote-tracking branch 'upstream/master'
Merge pull request #251 from kamidzi/master

Disable dhclient resolvconf enter hook
sort to avoid config file rewrites from random ordering
fix indentation for tailor check
fix bug in regex to fix logwatch color output
increase interval for haproxy checks to 5s