QPID-4746, QPID-4747:Fix the tests failing on IBM JDK

merged from trunk r1469256


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