Updates for federated queues.
Merged bug25553 into default