Reconfigure the server without catalog-zone configuration, and then put it back and reconfigure again, to confirm that there's no crash. (cherry picked from commit bb411af31d)
bb411af31d