Upscaled equations for two-phase flow in highly heterogeneous porous media: Varying permeability and porosity. (November 2020)