Make Health Status map play nice with CMR changes
Merge pull request #3152 from dimagi/opm

Make Health Status map play nice with CMR changes