'Gujarat’s year-long water shortage to be resolved': CM says deal to be finalised on Tuesday; Minister Pati…