dotcms_ant.jar #2780
Merge pull request #2801 from dotCMS/issue-2780-plugin-merger-error

dotcms_ant.jar #2780