Cs 5347

Fixes issues with tinymce campsite image popup and rich text captions.