QPID-4502: Apply review comments from Robbie Gemmell merge from https://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/java-broker@1425665