More merge throttling tweaks: start with a lower throttling time and a lower threshold, cap the maximum throttle so that pathological workloads don't appear to wait forever.