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

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