Merge remote-tracking branch 'origin/MAGETWO-58261-customer-change-password' into pr

# Conflicts:
#	dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
#	dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php

@@ -114,7 +114,7 @@ class CustomerForm extends Form
     /**
      * Set 'Change Email' checkbox value.
      *
-     * @param string $value
+     * @param boolean $value
      * @return void
      */
     public function setChangeEmail($value)
@@ -124,13 +124,13 @@ class CustomerForm extends Form
             $mapping['change_email']['selector'],
             $mapping['change_email']['strategy'],
             'checkbox'
-        )->setValue($value);
+        )->setValue($value ?  "Yes" : "No");
     }
 
     /**
      * Set 'Change Password' checkbox value.
      *
-     * @param string $value
+     * @param boolean $value
      * @return void
      */
     public function setChangePassword($value)
@@ -140,7 +140,7 @@ class CustomerForm extends Form
             $mapping['change_password']['selector'],
             $mapping['change_password']['strategy'],
             'checkbox'
-        )->setValue($value);
+        )->setValue($value ?  "Yes" : "No");
     }
 
     /**

dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php

@@ -73,7 +73,7 @@ class SecureChangingCustomerPasswordTest extends Injectable
 
         $this->customerAccountEdit->getAccountMenuBlock()->openMenuItem('Account Information');
         if ($check) {
-            $this->customerAccountEdit->getAccountInfoForm()->SetChangePassword('Yes');
+            $this->customerAccountEdit->getAccountInfoForm()->SetChangePassword(true);
             $this->customerAccountEdit->getAccountInfoForm()->fill($customer);
             $this->customerAccountEdit->getAccountInfoForm()->submit();
         }