diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php
index 670420a..f800bbd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php
@@ -39,7 +39,7 @@ public function testRoleUpgrade() {
 
     // Check that "gärtner" has been converted to "4" and that the role
     // edit page for it exists.
-    $this->drupalGet('admin/people/roles/edit/4');
+    $this->drupalGet('admin/people/roles/manage/4');
     $this->assertResponse(200, 'Role edit page for "gärtner" was found.');
 
     // Check that the anonymous user role ID has been converted from "1" to
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index a931835..409b033 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -39,10 +39,10 @@ user_role_add:
   defaults:
     _entity_form: user_role.default
   requirements:
-    _entity_access: user_role.create
+    _permission: 'administer permissions'
 
 user_role_edit:
-  pattern: '/admin/people/roles/manage/{user_role}/edit'
+  pattern: '/admin/people/roles/manage/{user_role}'
   defaults:
     _entity_form: user_role.default
   requirements:
diff --git a/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php b/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php
index 24801f3..3a65cd2 100644
--- a/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php
+++ b/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php
@@ -63,8 +63,8 @@ public function buildForm(array $form, array &$form_state, Role $user_role = NUL
    */
   public function submitForm(array &$form, array &$form_state) {
     $this->user_role->delete();
-    watchdog('user', 'The role %name has been deleted.', array('%name' => $this->user_role->label()));
-    drupal_set_message(t('The role %name has been deleted.', array('%name' => $this->user_role->label())));
+    watchdog('user', 'Role %name has been deleted.', array('%name' => $this->user_role->label()));
+    drupal_set_message(t('Role %name has been deleted.', array('%name' => $this->user_role->label())));
     $form_state['redirect'] = 'admin/people/roles';
   }
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php
index 2975f39..43b9827 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php
@@ -63,7 +63,7 @@ function testRoleAdministration() {
     // Test deleting a role.
     $this->drupalPost("admin/people/roles/manage/{$role->id()}", array(), t('Delete'));
     $this->drupalPost(NULL, array(), t('Delete'));
-    $this->assertRaw(t('The role %label has been deleted.', array('%label' => $role_name)));
+    $this->assertRaw(t('Role %label has been deleted.', array('%label' => $role_name)));
     $this->assertNoLinkByHref("admin/people/roles/manage/{$role->id()}", 'Role edit link removed.');
     $this->assertFalse(entity_load('user_role', $role_name), 'A deleted role can no longer be loaded.');