Upscaling of Two-Phase Flow with Capillary Pressure Heterogeneity Effects