Amend Water Code to comply with requirements per State statutes, correct a previous inadvertent omission, and clarify language (amend Code Sections 21.04.010, 21.08.020, 21.12.010, and 21.12.320)