MC-39757: Email to reset admin password shows "Your password reset link has expired", when using custom template

Author: rostyslav-hymon

app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html

@@ -7,7 +7,7 @@
 <!--@subject {{trans "Password Reset Confirmation for %name" name=$username}} @-->
 <!--@vars {
 "var store.frontend_name":"Store Name",
-"var user.id":"Account Holder Id",
+"var user.user_id":"Account Holder Id",
 "var user.rp_token":"Reset Password Token",
 "var user.name":"Account Holder Name",
 "store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.user_id _query_token=$user.rp_token":"Reset Password URL",

dev/tests/integration/testsuite/Magento/User/Model/UserTest.php

@@ -591,7 +591,7 @@ public function testSendNotificationEmailsIfRequired()
             ->get(MutableScopeConfigInterface::class);
         $config->setValue(
             'admin/emails/new_user_notification_template',
-            $this->getCustomEmailTemplateIdForNewUserNotification(
+            $this->getCustomEmailTemplateId(
                 'admin_emails_new_user_notification_template'
             )
         );
@@ -621,17 +621,17 @@ public function testSendNotificationEmailsIfRequired()
     }
 
     /**
-     * Return email template id for new user notification
+     * Return email template id by origin template code
      *
      * @param string $origTemplateCode
      * @return int|null
      * @throws NotFoundException
      */
-    private function getCustomEmailTemplateIdForNewUserNotification(string $origTemplateCode): ?int
+    private function getCustomEmailTemplateId(string $origTemplateCode): ?int
     {
         $templateId = null;
         $templateCollection = Bootstrap::getObjectManager()
-            ->get(TemplateCollection::class);
+            ->create(TemplateCollection::class);
         foreach ($templateCollection as $template) {
             if ($template->getOrigTemplateCode() == $origTemplateCode) {
                 $templateId = (int) $template->getId();
@@ -659,7 +659,7 @@ public function testNotificationEmailsIfResetPassword()
             ->get(MutableScopeConfigInterface::class);
         $config->setValue(
             'admin/emails/forgot_email_template',
-            $this->getCustomEmailTemplateIdForNewUserNotification(
+            $this->getCustomEmailTemplateId(
                 'admin_emails_forgot_email_template'
             )
         );