merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-amqp-1-0-management@1563433 13f79535-47bb-0310-9956-ffa450edef68