City Council Rescheduled; Agenda Includes Water Plan