Merge remote-tracking branch 'origin/bugfix/7807-remove-duplicate-openjdk-jre' into...