Replace deprecated User::editToken with User::getEditToken (1.19)

Change-Id: I7ce2901aac0c03e52621c68febb11084793a9d3e
Merge "Replace deprecated User::editToken with User::getEditToken (1.19)"