QPID-5344 : Deadlock in JMS AMQP 1.0 client - patch from David Ingham

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1544129 13f79535-47bb-0310-9956-ffa450edef68
QPID-5364: [Java Broker Management] Give RestServlet instances different servlet names (for diagnostic purposes) and correct error message used when path info has too many components.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1544228 13f79535-47bb-0310-9956-ffa450edef68
Merge trunk into messaging-logging
WIP: very small tidy up