drop underscores from variable names which do not need them

---

Migrated from D6290 (view on Phabricator)

Build is green

Patch application report for D6290 (id=22865)

Rebasing onto 83ea782a...

Current branch diff-target is up to date.

Changes applied before test

commit dd8a625ca0847563359c015738649f71d45abd9c
Author: Stefan Sperling <stsp@stsp.name>
Date:   Fri Sep 17 15:49:07 2021 +0200

    drop underscores from variable names which do not need them

See https://jenkins.softwareheritage.org/job/DLDCVS/job/tests-on-diff/14/ for more details.

Merge request was accepted

approved this merge request

Merge request was merged

closed