Comment 7 for bug 1172936

This tests successfully on a rel_2_3 build also, insofar as one, or at most two, of the "spammed" search queries reach the database and add to load there.

Merging to rel_2_3 and rel_2_2, which will make this whole thing "Fix Committed"