Merge "Remove straggling zookeper references"