Use User::matchEditToken to compare tokens

In Ic4cf148c, edit tokens will be different every time
$user->getEditToken is called. $user->matchEditToken (which has existed
as long as getEditToken) correctly handles matching of the possible
tokens.

Change-Id: I4736dc028a4acf51c0c1196c5fa5a7f5bc98ff62
Merge "Use User::matchEditToken to compare tokens"