MAGETWO-61907: [Backport] - Updating customer via REST API without address unsets default billing and default shipping address - for 2.1

Author: svitja

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -329,12 +329,12 @@ protected function addFilterGroupToCollection(
     /**
      * Update customer addresses.
      *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param \Magento\Framework\Api\CustomAttributesDataInterface $customer
      * @param $customerId
      * @return void
      * @throws \Magento\Framework\Exception\InputException
      */
-    private function updateAddresses(\Magento\Customer\Api\Data\CustomerInterface $customer, $customerId)
+    private function updateAddresses(\Magento\Framework\Api\CustomAttributesDataInterface $customer, $customerId)
     {
         if ($customer->getAddresses() !== null) {
             if ($customer->getId()) {
@@ -367,12 +367,12 @@ private function updateAddresses(\Magento\Customer\Api\Data\CustomerInterface $c
     /**
      * Populate customer model with secure data.
      *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param \Magento\Framework\Api\CustomAttributesDataInterface $customer
      * @param $passwordHash
      * @param $customerModel
      */
     private function populateCustomerModelWithSecureData(
-        \Magento\Customer\Api\Data\CustomerInterface $customer,
+        \Magento\Framework\Api\CustomAttributesDataInterface $customer,
         $passwordHash,
         $customerModel
     ) {