Merge branch 'develop' into FearlessKiwis-MAGETWO-55117-ShippingMethodManagement-estimateByAddressId-not-full

Conflicts:
	app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php

Author: Mike Weis

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

@@ -22,7 +22,7 @@ public function execute()
         $responseData = [];
         try {
             $this->_objectManager->create(
-                'Magento\AdminNotification\Model\NotificationService'
+                \Magento\AdminNotification\Model\NotificationService::class
             )->markAsRead(
                 $notificationId
             );
@@ -31,7 +31,7 @@ public function execute()
             $responseData['success'] = false;
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->create('Magento\Framework\Json\Helper\Data')->jsonEncode($responseData)
+            $this->_objectManager->create(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($responseData)
         );
     }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

@@ -24,7 +24,7 @@ public function execute()
         if ($notificationId) {
             try {
                 $this->_objectManager->create(
-                    'Magento\AdminNotification\Model\NotificationService'
+                    \Magento\AdminNotification\Model\NotificationService::class
                 )->markAsRead(
                     $notificationId
                 );

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

@@ -27,7 +27,7 @@ public function execute()
         } else {
             try {
                 foreach ($ids as $id) {
-                    $model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
+                    $model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
                     if ($model->getId()) {
                         $model->setIsRead(1)->save();
                     }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -27,7 +27,7 @@ public function execute()
         } else {
             try {
                 foreach ($ids as $id) {
-                    $model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
+                    $model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
                     if ($model->getId()) {
                         $model->setIsRemove(1)->save();
                     }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

@@ -22,7 +22,7 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio
     public function execute()
     {
         if ($id = $this->getRequest()->getParam('id')) {
-            $model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
+            $model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
 
             if (!$model->getId()) {
                 $this->_redirect('adminhtml/*/');

app/code/Magento/AdminNotification/Model/Inbox.php

@@ -38,7 +38,7 @@ class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierIn
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\ResourceModel\Inbox');
+        $this->_init(\Magento\AdminNotification\Model\ResourceModel\Inbox::class);
     }
 
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

@@ -19,7 +19,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\Inbox', 'Magento\AdminNotification\Model\ResourceModel\Inbox');
+        $this->_init(
+            \Magento\AdminNotification\Model\Inbox::class,
+            \Magento\AdminNotification\Model\ResourceModel\Inbox::class
+        );
     }
 
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

@@ -16,7 +16,10 @@ class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\Abst
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\Inbox', 'Magento\AdminNotification\Model\ResourceModel\Inbox');
+        $this->_init(
+            \Magento\AdminNotification\Model\Inbox::class,
+            \Magento\AdminNotification\Model\ResourceModel\Inbox::class
+        );
     }
 
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

@@ -51,8 +51,8 @@ public function __construct(
     protected function _construct()
     {
         $this->_init(
-            'Magento\AdminNotification\Model\System\Message',
-            'Magento\AdminNotification\Model\ResourceModel\System\Message'
+            \Magento\AdminNotification\Model\System\Message::class,
+            \Magento\AdminNotification\Model\ResourceModel\System\Message::class
         );
     }
 

app/code/Magento/AdminNotification/Model/System/Message.php

@@ -15,7 +15,7 @@ class Message extends \Magento\Framework\Model\AbstractModel implements \Magento
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\ResourceModel\System\Message');
+        $this->_init(\Magento\AdminNotification\Model\ResourceModel\System\Message::class);
     }
 
     /**