QPID-3642: Fix for redelivery regression found by python tests Applied patch from Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com>