Update logging jars (rebased)

See gh-966 for details.

--rebased-from #966