Merge branch 'master' into update-jdk-11

maximthomas

29.55.2025 9df0c0351216575123c607a39c5c7ec453bae64b

 opendj-cli/src/main/resources/templates/dscfgSubcommand.ftl

@@ -13,7 +13,7 @@
  information: "Portions Copyright [year] [name of copyright owner]".

  Copyright 2011-2017 ForgeRock AS.
  Portions Copyright ${year} 3A Systems LLC.
  Portions Copyright 2024-${year} 3A Systems LLC.
////

[#${id}]