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

* master-v2:
  [UIMA-6188] uimaFIT initializes resources with parameter values originating from component