QPID-6192: [Java Broker] Incorporate some feedbackk from Rob Godfrey.

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