Fixed issues with retry messages
Fixed issues with retry messages

wikimedia/change-propagation,d00rman/restbase-mod-queue-kafka,Pchelolo/change-propagation,Pchelolo/change-propagation,wikimedia/change-propagation