Make zkClusterService optional again and just properly guard against NPEs