Merging from trunk r1619093:1620329 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620350 13f79535-47bb-0310-9956-ffa450edef68
Merge r1619137 from trunk to address QPID-6024

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620361 13f79535-47bb-0310-9956-ffa450edef68