[backport-1.4]: maxSurge 0 / need to avoid parallel downscaling of MDs (and CP)

Issue #2484 (closed) needs to be backported to 1.4.x