Merge branch 'MAGETWO-24173' of github.corp.ebay.com:magento-mpi/magento2ce into pull-request

Author: Dell-

app/code/Magento/Sales/Model/Order.php

@@ -520,7 +520,7 @@ public function canVoidPayment()
      */
     protected function _canVoidOrder()
     {
-        return !($this->canUnhold() || $this->isPaymentReview());
+        return !($this->isCanceled() || $this->canUnhold() || $this->isPaymentReview());
     }
 
     /**

app/code/Magento/Sales/Test/Unit/Model/OrderTest.php

@@ -348,6 +348,11 @@ public function testCanVoidPayment($actionFlags, $orderState)
         $order->setData('state', $orderState);
         $payment = $this->_prepareOrderPayment($order);
         $canVoidOrder = true;
+
+        if ($orderState == \Magento\Sales\Model\Order::STATE_CANCELED) {
+            $canVoidOrder = false;
+        }
+
         if ($orderState == \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW) {
             $canVoidOrder = false;
         }