Backport of issue #2314057 to make workarounds for missing HTML body and a new default for excluded file paths.
