Merge from trunk

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