Switch to a MOVED file so people darn well know they don't have the right checkout.
Merge remote-tracking branch 'old/master'
Merge branch 'beta'
MBS-3663: fix up no-vote email test
Fix remember me token tests

They now correctly check that the TTL of a token is reduced to 5
minutes, and the token allocator now returns 'undef' for user names
that don't exist.