INTEGRATION [PR#4254 > development/8.4] improvement: CLDSRV-49 fix tests

[bert-e]

This pull request has been created automatically. It is linked to its parent pull request #4254.

Do not edit this pull request directly. If you need to amend/cancel the changeset on branch w/8.4/improvement/CLDSRV-49-fix-tests, please follow this procedure:

 $ git fetch
 $ git checkout w/8.4/improvement/CLDSRV-49-fix-tests
 $ # <amend or cancel the changeset by _adding_ new commits>
 $ git push origin w/8.4/improvement/CLDSRV-49-fix-tests

Please always comment pull request #4254 instead of this one.