Fix failing unit tests on 1.10.x - TRUNK-4182