MAGETWO-36131: Update Content in Magento 2 by Modules - part 3

- Merge remote-tracking branch 'origin/develop' into PR

- Conflicts:
	- app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
	- app/code/Magento/GiftMessage/view/frontend/web/template/item-level-gift-message.html
	- app/code/Magento/GiftMessage/view/frontend/web/template/order-level-gift-message.html
	- app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
	- dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
	- dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php