Bug #2676: Ensure Zone TEMPLATE/ENDPOINT always exists