QPID-4657, QPID-4683 : merged to QPID-4659 branch

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