Merge branch 'master' into feature/UIMA-6005-Compare-API-changes-against-latest-uimaFIT-v2-release-master