Fix #3056, avoid CMS.Plugin name clashes with render_model_icon and render_model_block
Fix wrong dict name and python 3 compatibility