Issue #2339021 by catch: Fixed Incorrect call to l() in system_token_info.
Issue #2303361 by tim.plunkett, kim.pepper: Replace instances of deprecated drupal_valid_path with PathValidator.