Zone configuration consolidation

- Added zoneset configuration to the not-defined block to have single zoneset apply and avoid conflict.