only in patch2:
unchanged:
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -7,8 +7,10 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldFilteredString;
 use Drupal\Core\Render\Element;
 
+
 /**
  * Returns HTML for an individual file upload widget.
  *
@@ -167,7 +169,7 @@ function template_preprocess_file_upload_help(&$variables) {
   $descriptions = array();
 
   if (!empty($description)) {
-    $descriptions[] = Html::normalize($description);
+    $descriptions[] = FieldFilteredString::create($description);
   }
   if (isset($cardinality)) {
     if ($cardinality == -1) {
only in patch2:
unchanged:
--- a/core/modules/options/src/Tests/OptionsFormattersTest.php
+++ b/core/modules/options/src/Tests/OptionsFormattersTest.php
@@ -38,7 +38,7 @@ public function testFormatter() {
 
     $build = $items->view(array('type' => 'list_key'));
     $this->assertEqual($build['#formatter'], 'list_key', 'The chosen formatter is used.');
-    $this->assertEqual($build[0]['#markup'], 1);
+    $this->assertEqual((string) $build[0]['#markup'], 1);
   }
 
 }