A Turbulence Closure for the Convective Boundary Layer Based on a Two-Scale Mass-Flux Approach