[stable-3.15] fix regressions in automated tests for bulk upload

[stable-3.15] fix regressions in automated tests for bulk upload #8823