MC-15776: Merge release branch into 2.3-develop

- fix static failures

Author: krissyhiserote

app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /** @var $upsModel \Magento\Ups\Helper\Config */
 /** @var $block \Magento\Ups\Block\Backend\System\CarrierConfig */
 $upsCarrierConfig = $block->getCarrierConfig();