Merge branch 'less4jupdate' into 1.7.x
Merge branch 'issue779' into 1.7.x
Merge branch 'issue660-partial' into 1.7.x
don't use DEBUG during testing
Merge branch 'logLevel' into 2.0.x