OPENUCB-131 Fix RC5 Panopoly wysiwyg issues and allow overrides