When the U.S. Congress adjourned in December, it scrapped a water-rights settlement package meant to end years of bitter haggling in California and Oregon’s Klamath Basin among farmers, fishermen, utilities ratepayers and environmentalists.