[WIP] Upgrade to rails master/4.2

I was going to send this when I have the complete set of patches required, but I noticed @SamSaffron has started working on it too, so we should probably share notes :smile:
By the way, this is because of https://github.com/rails/rails/issues/17380. But the "fix" totally doesn't work, which is why I changed the test instead.