QPID-4685: additional documentation updates

mergd from trunk r1484417


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