assert queue dlx arg equivalence
and restructure code to make future omissions less likely
Merge bug 25385 (into default, although it was branched from stable).
tweak: make use of rabbit_misc:rs/1
merge default into bug25345
tweak: make use of rabbit_misc:rs/1