Bug #5329 - adjusting some unit test wrappers according to the recent WysiwygManager creation.
Merge branch 'bug-5329-purge-5.15.x'