[UIMA-6214] Method signature class in ExternalResourceFactory

* Merge branch '3.0.x' of https://github.com/mjunsilo/uima-uimafit into UIMA-6214-Method-signature-clash-in-ExternalResourceFactory
* This merge brings in the unit test provided by Mario Juric with the original bug report

# Conflicts:
#	uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java