fixes #2803
Merge pull request #2805 from dotCMS/issue-2803-unit-test-plugin-merger

fixes #2803
#2803
unti test
#2803
#2759 improved cmis test