Merge remote-tracking branch 'origin/MAGETWO-59821' into BUGS

Author: sevos1984

app/code/Magento/GiftMessage/view/frontend/web/js/model/gift-message.js

@@ -124,7 +124,7 @@ define([
              */
             afterSubmit: function () {
                 window.location.href = url.build('checkout/cart/updatePost') +
-                    '?form_key=' + window.giftOptionsConfig.giftMessage.formKey +
+                    '?form_key=' + window.checkoutConfig.formKey +
                     '&cart[]';
             },