Merge pull request #767 from afs/logging2

JENA-1928: Logging improvements