#2870
Merge pull request #2886 from dotCMS/issue-2870-GenericBundleActivator-unregisterAll-error

#2870
Update dotmarketing-config.properties

#2895
Merge remote-tracking branch 'origin/master' into issue-2093-make-containers-support-multiple-structures
remove for_metadata field #2093