Remove hack after heimdal daemon remove
Merge branch 'master' into scabrero/delete-dns-srv-hack
Merge pull request #1355 from Zentyal/scabrero/delete-dns-srv-hack

Scabrero/delete dns srv hack