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

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