Add two new indicators, replacing a broken one

Client decided old 1E wasn't what they needed to see, but rather needed
two different values here.
Merge pull request #1786 from dimagi/care-indicators

Add two new indicators, replacing a broken one