Split old org unit setting type circ.hold_estimate_wait_interval into two: