Merge branch 'sh-handle-null-bytes-in-merge-request-diffs' into 'master'

Fix error creating a merge request when diff includes a null byte

Closes #57710

See merge request gitlab-org/gitlab-ce!26190

(cherry picked from commit a885e2d0)

6552197e Fix error creating a merge request when diff includes a null byte