QPID-5679 : Address review comments from Alex Rudyy

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