[1/5] Catalog zones lightweight cleanup

Do some lightweight code cleanup and fixes in preparation of adding some new feature from the latest DNS catalog zones draft.

Edited Apr 26, 2022 by Michał Kępień

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information