Merge from trunk up to r1494530

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-vhost-refactor@1494534 13f79535-47bb-0310-9956-ffa450edef68
5 files changed