#3759
Merge pull request #3760 from dotCMS/issue-3759-Modify-OSGI-override-plugin-to-work-with-latest-code

#3759