Merge branch 'master-v2' into bugfix/UIMA-6242-uimaFIT-Maven-plugin-should-fail-on-error-by-default

* master-v2:
  [UIMA-6240] Failure to resolve type system imports when generating descriptors