Docker _upload dir cleanup uses inefficient query [RTFACT-19936]