Misc fixes for cmsplugin_html with Django CMS 3