Fix constraints to not have a lingering pin on edx-when. And
add constraint on version of mock that supports python 3.5.

And then a general make upgrade.