Merge branch 'MAGETWO-49154-updated' into MAGETWO-50676

Conflicts:
	app/code/Magento/Security/view/adminhtml/layout/admin_login.xml
	app/code/Magento/Security/view/adminhtml/layout/default.xml
	app/code/Magento/Security/view/adminhtml/layout/security_session_activity.xml
	app/code/Magento/Security/view/adminhtml/page_layout/admin-popup.xml
	lib/internal/Magento/Framework/Model/Entity/Action/CreateExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/CreateMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/CreateRelation.php
	lib/internal/Magento/Framework/Model/Entity/Action/DeleteExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/DeleteMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/DeleteRelation.php
	lib/internal/Magento/Framework/Model/Entity/Action/ReadExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/ReadMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/ReadRelation.php
	lib/internal/Magento/Framework/Model/Entity/Action/UpdateExtension.php
	lib/internal/Magento/Framework/Model/Entity/Action/UpdateMain.php
	lib/internal/Magento/Framework/Model/Entity/Action/UpdateRelation.php
	lib/internal/Magento/Framework/Model/Entity/MetadataPool.php
	lib/internal/Magento/Framework/Model/Operation/ContextHandlerInterface.php
	lib/internal/Magento/Framework/Model/Operation/Read.php
	lib/internal/Magento/Framework/Model/Operation/Write/Create.php
	lib/internal/Magento/Framework/Model/Operation/Write/Delete.php
	lib/internal/Magento/Framework/Model/Operation/Write/Update.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/CreateExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/CreateMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/CreateRelationTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/DeleteExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/DeleteMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/DeleteRelationTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/ReadExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/ReadMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/ReadRelationTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/UpdateExtensionTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/UpdateMainTest.php
	lib/internal/Magento/Framework/Model/Test/Unit/Entity/Action/UpdateRelationTest.php