TRUNK-4443 Fixed failing integration tests

(cherry picked from commit ee12c7cd1881efdcef737d27740123f32af5a901)