Merge from trunk

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