QPID-4657, QPID-4683: review changes

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1463142 13f79535-47bb-0310-9956-ffa450edef68
 QPID-4594, QPID-4682: review changes

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