Merge branch 'main' into UIMA-6331-uimaFIT-3.2.0-release

* main:
  UIMA-6351: japicmp post processing script fails with Java 16 (uimaFIT)
  [UIMA-6336] Align select behaviors of uimaFITv2 with uimaFITv3