OCD
Avoid overlong debug message

JAVA-240 #fixes
Merge branch '1.0' into 2.0