The city of San Diego and East County leaders have resolved a months-long dispute over a planned water recycling project, heading off a potentially expensive court fight over what to do with the plant’s waste.