Merge branch 'FearlessKiwis-MAGETWO-35973-cache_variation_string' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Conflicts:
	app/code/Magento/Tax/Model/Calculation.php

Author: Robert He

app/code/Magento/Tax/Model/Calculation.php

@@ -207,7 +207,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param FilterBuilder $filterBuilder
      * @param TaxClassRepositoryInterface $taxClassRepository
-     * @param \Magento\Framework\Data\Collection\Db $resourceCollection
+     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -229,7 +229,7 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         FilterBuilder $filterBuilder,
         TaxClassRepositoryInterface $taxClassRepository,
-        \Magento\Framework\Data\Collection\Db $resourceCollection = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->_scopeConfig = $scopeConfig;