Merge branch 'MDL-75923-400' of https://github.com/andrewnicols/moodle …

…into MOODLE_400_STABLE

admin/tool/usertours/tests/behat/tour_content_type.feature

@@ -58,15 +58,15 @@ Feature: Apply content type to a tour
     And I click on "New step" "link"
     And I set the field "Title" to "tour_activityinfo_course_teacher_title,tool_usertours"
     And I select "Manual" from the "Content type" singleselect
-    And I set the field "id_content" to "<b>Test content</b>"
+    And I set the field "id_content" to "<p><strong>Test content</strong></p>"
     And I press "Save changes"
     And I should see "New: Activity information"
     And I should see "Test content"
     And I click on "Edit" "link" in the "New: Activity information" "table_row"
     And I should see "Editing \"New: Activity information\""
     And I should not see "Language string ID" in the "#fitem_id_contentlangstring" "css_element"
     And the field "Title" matches value "tour_activityinfo_course_teacher_title,tool_usertours"
-    And the field "id_content" matches value "<b>Test content</b>"
+    And the field "id_content" matches value "<p><strong>Test content</strong></p>"
 
   @javascript
   Scenario: Tour name and description can be translatable