WP-2648: Add contrib patch to fix collapsing secondary BEF filters.