Revert "Revert "Merge pull request #4593 from dimagi/monitoring""

This reverts commit 023faa7128c9462b0458302f5c7a819c7c607f40.
Merge pull request #4600 from dimagi/monitoring

update WAR to use unadjusted end dates