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