Rework ZoneType form to not depend on Model
Merge pull request #1349 from stloyd/feature/cleanup_components

[AddressingBundle] Rework ZoneType form to not depend on Model