MAGETWO-39638: PR Merge Activity

 - correct bad merge of obsolete_methods.php

Author: Cari Spruiell

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2324,17 +2324,6 @@
         'Magento\Authorizenet\Model\Directpost',
         'Magento\Authorizenet\Model\Directpost::setDataHelper()'
     ],
-    ['_getPayPalPaymentsPro3dSecure', 'Magento\Config\Test\Repository\Config'],
-    [
-        'getCreatedAtFormated',
-        'Magento\Sales\Model\Order',
-        'Magento\Sales\Model\Order::getCreatedAtFormatted',
-    ],
-    [
-        '_getConfig',
-        'Magento\Store\Model\Store',
-        'Magento\Store\Model\Store::getConfig',
-    ],
     ['getChilds', 'Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer', 'getChildren'],
     ['getChilds', 'Magento\Bundle\Block\Sales\Order\Items\Renderer', 'getChildren'],
     ['getChilds', 'Magento\Bundle\Model\Sales\Order\Pdf\Items\AbstractItems', 'getChildren'],