Merge pull request #13 from apache/refactoring/UIMA-6441-Update-plugins

[UIMA-6441] Update plugins