Observers of California’s longtime water wars expect language inserted into a major water bill last week to exacerbate the ongoing competition between fish and farms for scarce supplies.