State, U.S. Sign Historic Water Deal