Merge fix for bug 2631 (included in recent delivery) and workaround for bug 2620.
EXPORTS
_ZN19CMediatorPluginBase4NewLE4TUid @ 1 NONAME
_ZN19CMediatorPluginBaseD0Ev @ 2 NONAME
_ZN19CMediatorPluginBaseD1Ev @ 3 NONAME
_ZN19CMediatorPluginBaseD2Ev @ 4 NONAME
_ZTI19CMediatorPluginBase @ 5 NONAME ; #<TI>#
_ZTV19CMediatorPluginBase @ 6 NONAME ; #<VT>#