ACCUMULO-3377 Add exception to log message
Merge branch '1.6'