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

Author: Robert He

app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php

@@ -78,7 +78,7 @@ public function getMetadataValues(\Magento\SalesRule\Model\Rule $rule)
         $applyOptions = [
             ['label' => __('Percent of product price discount'), 'value' =>  Rule::BY_PERCENT_ACTION],
             ['label' => __('Fixed amount discount'), 'value' => Rule::BY_FIXED_ACTION],
-            ['label' => __('Fixed amount discount for whole cart'), 'value' => Rule::BY_PERCENT_ACTION],
+            ['label' => __('Fixed amount discount for whole cart'), 'value' => Rule::CART_FIXED_ACTION],
             ['label' => __('Buy X get Y free (discount amount is Y)'), 'value' => Rule::BUY_X_GET_Y_ACTION]
         ];
 

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php

@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 return [
     'rule_information' =>
         [
@@ -101,7 +106,7 @@
                                                             ],
                                                             [
                                                                 'label' => __('Fixed amount discount for whole cart'),
-                                                                'value' => 'by_percent',
+                                                                'value' => 'cart_fixed',
                                                             ],
                                                             [
                                                                 'label' => __(