backported redis queue migration
Merge pull request #5755 from mohitmamoria/redis-queue-fix-backport

Backported Redis Queue migration fix to 4.2