Bug 846096:  Be more consistent about annotating failures due to bug 846096, and mark them with the bug number.