I'd just export the config.xml and reinstall with a fresh 22.7 which comes out next week and then restore config.You lose logs and such but unavoidable without extra effort when changing from UFS to ZFS.