merge from trunk up to revision 1438053

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-qpid-4390@1438629 13f79535-47bb-0310-9956-ffa450edef68