Merge branch 'backport-java-new-packaging' into java-new-packaging

Fix conflicts by combining the changes from both sides.
8 jobs for java-new-packaging
Status Name Job ID Coverage
  External
passed ghostflow-branch-check-master

passed ghostflow-commit-check

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager