Merge pull request #1756 from clebertsuconic/2.4.x

https://bugzilla.redhat.com/show_bug.cgi?id=1013777 - Large Message Sync  could be left unattended after failure