MAGETWO-67283: quote_address.free_shipping is different depending on whether Magento was upgraded vs installed

Author: nmalevanec

app/code/Magento/OfflineShipping/Setup/UpgradeSchema.php

@@ -40,7 +40,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
     }
 
     /**
-     * Modify free_shipping columns added incorrectly in InstallSchema.
+     * Modify 'free_shipping' and 'simple_free_shipping' columns added incorrectly in InstallSchema.
      *
      * @param SchemaSetupInterface $setup
      * @return void
@@ -57,7 +57,6 @@ private function updateFreeShippingColumns(SchemaSetupInterface $setup)
                 'default' => '0',
                 'comment' => 'Simple Free Shipping',
             ]
-
         );
         $setup->getConnection(self::$salesConnectionName)->modifyColumn(
             $setup->getTable('sales_order_item', self::$salesConnectionName),
@@ -69,7 +68,6 @@ private function updateFreeShippingColumns(SchemaSetupInterface $setup)
                 'default' => '0',
                 'comment' => 'Free Shipping',
             ]
-
         );
         $setup->getConnection(self::$quoteConnectionName)->modifyColumn(
             $setup->getTable('quote_address', self::$quoteConnectionName),
@@ -81,7 +79,6 @@ private function updateFreeShippingColumns(SchemaSetupInterface $setup)
                 'default' => '0',
                 'comment' => 'Free Shipping',
             ]
-
         );
         $setup->getConnection(self::$quoteConnectionName)->modifyColumn(
             $setup->getTable('quote_item', self::$quoteConnectionName),

app/code/Magento/OfflineShipping/composer.json

@@ -8,14 +8,14 @@
         "magento/module-backend": "100.2.*",
         "magento/module-shipping": "100.2.*",
         "magento/module-catalog": "101.1.*",
+        "magento/module-sales": "100.2.*",
         "magento/module-sales-rule": "100.2.*",
         "magento/module-directory": "100.2.*",
         "magento/module-quote": "100.2.*",
         "magento/framework": "100.2.*"
     },
     "suggest": {
         "magento/module-checkout": "100.2.*",
-        "magento/module-sales": "100.2.*",
         "magento/module-offline-shipping-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",