Issue #1934716 followup by hackwater: [Followup] Merge system.fast_404 config object into system.performance.