QPID-4685: additional documentation updates following broker configuration model changes merged from trunk r1484370