Merge branch 'master-v2' into sync-v2-to-master

* master-v2:
  [UIMA-6186] Factory methods for resource instances
  [UIMA-6186] Factory methods for resource instances