Merge branch 'MAGETWO-65623-unserialize' of https://github.com/magento-jackalopes/magento2-sample-data into MAGETWO-65623-unserialize

Author: Joan He

app/code/Magento/CustomerSampleData/Model/Customer.php

@@ -89,7 +89,7 @@ class Customer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\App\State $appState
-     * @param Json $serializer
+     * @param Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(

app/code/Magento/WidgetSampleData/Model/CmsBlock.php

@@ -60,7 +60,7 @@ class CmsBlock
      * @param \Magento\Cms\Model\BlockFactory $cmsBlockFactory
      * @param \Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory $appCollectionFactory
      * @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory
-     * @param Json $serializer
+     * @param Json|null $serializer
      */
     public function __construct(
         SampleDataContext $sampleDataContext,