UC-1523 Exported JAR files needed by new plugin.
UC-1390 Included patch from upstream