Merge -c 1241659 from trunk to branch-0.23 to fix MAPREDUCE-3833. Fixed a bug in reinitiaziling of queues. Contributed by Jason Lowe.