when applying datespan shifts, make sure we don't go into the future
Merge branch 'master' of github.com:/dimagi/commcare-hq into indicator-pillows
Merge pull request #1351 from dimagi/indicator-pillows

when applying datespan shifts to indicator defs, make sure we don't go into the future