NO-JIRA: Final merge from trunk before reintegration

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha2@1583552 13f79535-47bb-0310-9956-ffa450edef68
tree: e5956bcab8ca15e10a787ef4c2b39633c6c795da
  1. qpid/
  2. .gitignore