Merge MAGETWO-95386 into 2.1.16-bugfixes-311018

Author: dvoskoboinikov

app/code/Magento/Theme/Model/Design/Backend/Exceptions.php

@@ -33,8 +33,8 @@ class Exceptions extends ArraySerialized
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param SecureUnserializer|null $secureUnserializer
      * @param array $data
+     * @param SecureUnserializer|null $secureUnserializer
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -44,8 +44,8 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        SecureUnserializer $secureUnserializer = null,
-        array $data = []
+        array $data = [],
+        SecureUnserializer $secureUnserializer = null
     ) {
         $this->_design = $design;
         $this->secureUnserializer = $secureUnserializer ?: