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

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