Just don't delete the upstream queue, ever. That's easier to reason about.
Merged bug25707 into stable
Merged stable into default
Uh, post bug 25707 that test makes no sense, and fails frequently.
Merge in default.