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

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