QPID-5825: Changes to address some review comments for initial commit

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