update WAR to use unadjusted end dates

Revert "Revert "Merge pull request #4593 from dimagi/monitoring""
This reverts commit 023faa7128c9462b0458302f5c7a819c7c607f40.