Revert "another attempt to sync up views and celery tasks"

This reverts commit e93dd8454426e6d45c48127aa8604f58f0f82871.
try harder to pin fileupload query to master
use same model to verify pwreset tokens as to generate them (bug 990500)