OPM Conditions Met report

This is actually just https://github.com/dimagi/commcare-hq/pull/3143, but I'm resolving a merge conflict, and adding a two-word fix to make it run.