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

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