Nalexander/bug 979075 http head for token server skew

Probably not necessary now, but I did it 'cuz I was tired of seeing failures during testing.  We should land it anyways.

There's no dep on earlier work, just lazy tree management.