Fix ftu

This pull request contains the fixes needed for the ftu failures on v1-train, but something is up with my master branch, so it also includes a ton of unneeded merge commits, and one calendar commit that I think shouldn't be there.

I want to submit the changes, so @zacc, can you just cherry pick the one commit that addresses the ftu failures?

Sorry about this. I haven't worked on master in ages.