Fix bad patch from when we switched to quilt.
Fix bad patch from when we switched to quilt.

Addresses-Debian-Bug: 820847
Addresses-Ubuntu-Bug: 1552801, 1549788, 1553460

tjaalton/bind9,tjaalton/bind9,tjaalton/bind9,tjaalton/bind9,tjaalton/bind9,tjaalton/bind9