Merging from trunk r1616716:1616818 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620333 13f79535-47bb-0310-9956-ffa450edef68
Merging from trunk r1617238:1617301 in the Java tree

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