CLC-940 Do not change date-string format when time-shifting Canvas proxy

Also fix bug that took end-of-this-week to mean next-week.