Show monthly consumption value in places it is set
Fix tests
Merge pull request #3585 from dimagi/consumptionfixesagain

Show monthly consumption value in places it is set