Merge remote-tracking branch '36669/patch-2' into comprs_jul

Author: engcom-Charlie

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -161,7 +161,7 @@ class StorageTest extends TestCase
         'jpg' => 'image/jpg',
         'jpeg' => 'image/jpeg',
         'png' => 'image/png',
-        'gif' => 'image/png',
+        'gif' => 'image/gif',
     ];
 
     /**