Merge branch 'develop' of github.com:magento-folks/magento2ce into bugfix

.travis.yml

...w/frontend/web/js/view/payment/method-renderer/cc-form.js

...iew/frontend/web/js/view/payment/method-renderer/vault.js

...to/Braintree/view/frontend/web/template/payment/form.html

app/code/Magento/Bundle/Model/Product/SaveHandler.php

app/code/Magento/Cms/Block/Page.php

app/code/Magento/Cookie/Helper/Cookie.php

...Magento/Cookie/view/frontend/templates/html/notices.phtml

app/code/Magento/Cookie/view/frontend/web/js/notices.js

...Magento/Msrp/view/base/templates/product/price/msrp.phtml

...view/frontend/templates/render/item/price_msrp_item.phtml

...gento/Multishipping/Model/Checkout/Type/Multishipping.php

...pping/Test/Unit/Model/Checkout/Type/MultishippingTest.php

app/code/Magento/Multishipping/composer.json

app/code/Magento/Multishipping/i18n/en_US.csv

...to/Payment/view/frontend/templates/info/pdf/default.phtml

...agento/Paypal/Block/Express/InContext/Minicart/Button.php

app/code/Magento/Paypal/Model/Api/AbstractApi.php

app/code/Magento/Paypal/Model/Api/PayflowNvp.php

app/code/Magento/Paypal/Model/Info.php