LADWP, Mammoth agree over water