Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666206 13f79535-47bb-0310-9956-ffa450edef68
tree: 25039371fedf5fcf1ea49685d0f9b4d78ade117f
  1. qpid/
  2. .gitignore
  3. .mailmap