Backport fix 3cd421c2c7af5c21c45bb39ea9972c926642aad2 to 2.11.x

As the class was fixed on master, but still same problem exists
on nexus-2.11.x branch, basically making ITs fail on developer
machine.