QPID-5422: DTX test failure, and some tidying up of code in JournalImpl.cpp/h

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1552772 13f79535-47bb-0310-9956-ffa450edef68