Merge topic 'Help-UseJava-reorganization' into release-3.21

af9bd6c53f Help: UseJava reorganization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6262