4912. [test] Improved the reliability of the 'cds' system test. [GL #136] (cherry picked from commit c92bacec)