Comment 16 for bug 1471161

Verified main fix with:
Bind9 + Master
Bind9 + Kilo

Verified quotas fix on:
Master
Kilo