Merge branch 'verboseLog' into 1.6.x
fix failing unit test
Merge branch 'less4j' into 2.0.x