Commit PR 265028 and PR 265025

From: Osipov, Michael <michael.osipov_at_siemens.com>
Date: Thu, 28 Jul 2022 06:36:18 UTC
Folks,

please commit both PRs for devel/maven and devel/maven-wrapper. All necessary
data is provided in both issues.

Michael