QPID-4967 - Bug fixes and added clean-up for unused addresses.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1530454 13f79535-47bb-0310-9956-ffa450edef68
QPID-5213 - Added -n option to qdstat to display router-node information.


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