removed "controversy_opt" option from "cm_dump_controversy" because it's no longer used
Merge branch 'master' into jobs_daemon_ui_add_default_feeds