QPID-4668: Message is only redelivered if delivery count is greater than 1 (merged from r1461249)

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