NO-JIRA: Merge latest changes back from trunk.

Changes merged with command:

svn merge -r 1549894:1558036 https://svn.apache.org/repos/asf/qpid/trunk



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