Mexico has reached a deal to deliver more water to the US under a decades-old treaty, calming a dispute that had threatened trade relations between the neighbouring nations.