GIDC plans to upgrade water supply system across estates