#2395
#2402 missed a commit
#2395
#2395
fixes #2409
Merge pull request #2411 from dotCMS/issue-2395-Dynamic-Plug-in-not-successfully-overridding-class

Issue 2395 dynamic plug in not successfully overridding class
Merge pull request #2410 from dotCMS/issue-2409-delete-old-cache-config-files

Issue 2409 delete old cache config files
Merge branch 'master' of github.com:dotCMS/dotCMS into issue-2382-sitesearch-improvements