QPID-4594, QPID-4682: review changes

merged from trunk r1463143


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