QPID-4657, QPID-4683: review changes

merged from trunk r1463142


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