Merge branch 'master' into feature/UIMA-6008-Update-to-UIMA-Core-2.10.3-master