MAGETWO-57426: [Github] Braintree Vault payments causing GET order API to throw error for 2.1.x

- Revert some BIC
- Changed methods annotation

Author: Dmytro Yushkin

app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php

@@ -89,7 +89,7 @@ protected function _afterLoad()
     /**
      * Convert multidimensional additional information array to single
      *
-     * @param $info
+     * @param array $info
      * @return array
      */
     private function convertAdditionalInfo($info)

app/code/Magento/Vault/Model/Method/Vault.php

@@ -31,6 +31,11 @@
  */
 final class Vault implements VaultPaymentInterface
 {
+    /**
+     * @deprecated
+     */
+    const TOKEN_METADATA_KEY = 'token_metadata';
+
     /**
      * @var string
      */
@@ -446,6 +451,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     /**
      * @param OrderPaymentInterface $orderPayment
      * @return void
+     * @throws \LogicException
      */
     private function attachTokenExtensionAttribute(OrderPaymentInterface $orderPayment)
     {