consolidate rows on the BPR
Merge pull request #4116 from dimagi/opm-es

consolidate rows on the BPR