one-time-login-url now in core

Status page:
Tokens Problems detected
The following token or token types are defined by multiple modules:
$info['tokens']['user']['one-time-login-url']
$info['tokens']['user']['url']
$info['tokens']['user']['name']
$info['tokens']['user']['edit-url']

The User module now supplies the tokens:

function user_update_7017() {
  $message = '';

  $tokens = array(
    '!site' => '[site:name]',
    '!username' => '[user:name]',
    '!mailto' => '[user:mail]',
    '!login_uri' => '[site:login-url]',
    '!uri_brief' => '[site:url-brief]',
    '!edit_uri' => '[user:edit-url]',
    '!login_url' => '[user:one-time-login-url]',
    '!uri' => '[site:url]',
    '!date' => '[date:medium]',
    '!password' => '',
  );