Merge "filebackend: rename and simplify header sanitizing methods in SwiftFileBackend"