Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-42984-2

Author: Oleh Posyniak

.htaccess

@@ -252,3 +252,10 @@
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
+
+############################################
+## Add custom headers
+<IfModule mod_headers.c>
+    Header set X-Content-Type-Options "nosniff"
+    Header set X-XSS-Protection "1; mode=block"
+</IfModule>

app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -10,7 +10,7 @@ class Messages extends \Magento\Backend\Block\Template
     /**
      * Message list
      *
-     * @var \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized
+     * @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized
      */
     protected $_messages;
 
@@ -21,13 +21,13 @@ class Messages extends \Magento\Backend\Block\Template
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
+     * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
+        \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
         array $data = []
     ) {

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

@@ -22,18 +22,18 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
     /**
      * System Message list
      *
-     * @var \Magento\AdminNotification\Model\Resource\System\Message\Collection
+     * @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
      */
     protected $_messages;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
+     * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
+        \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages,
         array $data = []
     ) {
         parent::__construct($context, $data);

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

@@ -33,18 +33,18 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
     /**
      * Collection of latest unread notifications
      *
-     * @var \Magento\AdminNotification\Model\Resource\Inbox\Collection
+     * @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
      */
     protected $_notificationList;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
+     * @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread $notificationList
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
+        \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread $notificationList,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -84,7 +84,7 @@ public function getUnreadNotificationCount()
     /**
      * Retrieve the list of latest unread notifications
      *
-     * @return \Magento\AdminNotification\Model\Resource\Inbox\Collection
+     * @return \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
      */
     public function getLatestUnreadNotifications()
     {

app/code/Magento/AdminNotification/Block/Window.php

@@ -31,7 +31,7 @@ class Window extends \Magento\Backend\Block\Template
     /**
      * Critical messages collection
      *
-     * @var \Magento\AdminNotification\Model\Resource\Inbox\Collection
+     * @var \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
      */
     protected $_criticalCollection;
 
@@ -51,13 +51,13 @@ class Window extends \Magento\Backend\Block\Template
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Model\Auth\Session $authSession
-     * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
+     * @param \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Critical $criticalCollection
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
+        \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Critical $criticalCollection,
         array $data = []
     ) {
         parent::__construct($context, $data);

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -14,7 +14,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
     protected $jsonHelper;
 
     /**
-     * @var \Magento\AdminNotification\Model\Resource\System\Message\Collection
+     * @var \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
      */
     protected $messageCollection;
 
@@ -23,12 +23,12 @@ class ListAction extends \Magento\Backend\App\AbstractAction
      *
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
+     * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection $messageCollection
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
-        \Magento\AdminNotification\Model\Resource\System\Message\Collection $messageCollection
+        \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection $messageCollection
     ) {
         $this->jsonHelper = $jsonHelper;
         $this->messageCollection = $messageCollection;

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

@@ -72,7 +72,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
      * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
      * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Framework\Model\Resource\AbstractResource $resource
+     * @param \Magento\Framework\Model\ModelResource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -86,7 +86,7 @@ public function __construct(
         \Magento\Framework\App\DeploymentConfig $deploymentConfig,
         \Magento\Framework\App\ProductMetadataInterface $productMetadata,
         \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Framework\Model\Resource\AbstractResource $resource = null,
+        \Magento\Framework\Model\ModelResource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {

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

@@ -12,8 +12,8 @@
 /**
  * AdminNotification Inbox model
  *
- * @method \Magento\AdminNotification\Model\Resource\Inbox _getResource()
- * @method \Magento\AdminNotification\Model\Resource\Inbox getResource()
+ * @method \Magento\AdminNotification\Model\ResourceModel\Inbox _getResource()
+ * @method \Magento\AdminNotification\Model\ResourceModel\Inbox getResource()
  * @method int getSeverity()
  * @method \Magento\AdminNotification\Model\Inbox setSeverity(int $value)
  * @method string getDateAdded()
@@ -38,7 +38,7 @@ class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierIn
      */
     protected function _construct()
     {
-        $this->_init('Magento\AdminNotification\Model\Resource\Inbox');
+        $this->_init('Magento\AdminNotification\Model\ResourceModel\Inbox');
     }
 
     /**