Merge branch 'master' of github.com:PowerDNS/pdns into jsonzone2sql
fix botched fix for s_quiet
fix how we emit 'disabled' for 't' and 'f' SQL, plus implement feature to supress duplicate SOAs and turn it on by default
Merge branch 'jsonzone2sql' of github.com:ahupowerdns/pdns into jsonzone2sql
make json-comments optional & off by default, remove switch from zoneparser-tng, turn on with get()
Merge branch 'jsonzone2sql'

Conflicts:
	pdns/zone2sql.cc
	pdns/zoneparser-tng.hh