Merge branch 'master-v2' into bugfix/UIMA-6275-InitializableFactory-is-not-smart-enough-to-find-a-suitable-classloader
* master-v2:
[UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
[UIMA-6275] InitializableFactory is not smart enough to find a suitable classloader
# Conflicts:
# uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java
# uimafit-core/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
# uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java