ISAICP-9114: Merge latest from develop.

config/sync/core.entity_view_display.node.custom_page.digest_message.yml

@@ -46,7 +46,7 @@ content:
         template_suggestion: ''
     weight: 1
     region: content
-  flag_like_node:
+  flag_like:
     settings: {  }
     third_party_settings: {  }
     weight: 10

config/sync/core.entity_view_display.node.custom_page.highlighted.yml

@@ -46,7 +46,7 @@ content:
         template_suggestion: ''
     weight: 1
     region: content
-  flag_like_node:
+  flag_like:
     settings: {  }
     third_party_settings: {  }
     weight: 10

config/sync/core.entity_view_display.node.custom_page.moderation.yml

@@ -46,7 +46,7 @@ content:
         template_suggestion: ''
     weight: 1
     region: content
-  flag_like_node:
+  flag_like:
     settings: {  }
     third_party_settings: {  }
     weight: 10

tests/features/ckeditor5.feature

@@ -261,20 +261,12 @@ Feature: CKEditor5
       | email                  | status    |
       | klim.smith@example.com | confirmed |
       | raul.timon@example.com | confirmed |
-    And collection:
-      | title               | Antiruin development |
-      | state               | published            |
-      | contact information | Raul Timon           |
-    And solution:
-      | title               | One exclusion advantages                          |
-      | abstract            | Separating molecules by height.                   |
-      | description         | Separating molecules by weight.                   |
-      | state               | published                                         |
-      | topic               | Demography, E-inclusion                           |
-      | owner               | Lotte                                             |
-      | solution type       | Non-binding Instrument, Data Owner                |
-      | collection          | Antiruin development                              |
-      | contact information | Klim Smith                                        |
+    And collection content:
+      | title                | state     | contact information |
+      | Antiruin development | published | Raul Timon          |
+    And solution content:
+      | title                    | abstract                        | description                     | state     | topic                   | owner | solution type                      | collection           | contact information |
+      | One exclusion advantages | Separating molecules by height. | Separating molecules by weight. | published | Demography, E-inclusion | Lotte | Non-binding Instrument, Data Owner | Antiruin development | Klim Smith          |
     And users:
       | Username    | E-mail         | First name | Family name |
       | jmacc_local | jodine@ankh.am | John       | Maccalariat |

tests/features/paragraphs/map.feature

@@ -4,10 +4,9 @@ Feature:
   I need to be able to use "map" paragraphs for content.
 
   Background:
-    Given the following collection:
-      | title | Paragraphs collection |
-      | state | published             |
-      | topic | HR                    |
+    Given collection content:
+      | title                 | state     | topic |
+      | Paragraphs collection | published | HR    |
 
   @javascript
   Scenario: Moderator can manage map.

tests/features/solution/manage_solutions.archive.feature

@@ -245,7 +245,7 @@ Feature: When a solution is archived then its sub-content also should be archive
       | Andrew Facilitator |
 
   Scenario Outline: Users must not be able to edit the sub-content of an archived solution
-    Given the workflow state of the "Solution" "rdf_entity" is changed to "published"
+    Given the workflow state of the "Solution" content is changed to "published"
     And I am logged in as "<User>"
 
     When I go to the homepage of the "Solution" solution