fix failing unit test
Merge branch 'less4jUpdate' into 1.7.x