Merge branch 'v2' into feature/username-update

Author: adorton-adobe

umapi_client/functional.py

@@ -175,8 +175,6 @@ def update(self, email=None, username=None, first_name=None, last_name=None, cou
         """
         if username and self.id_type != IdentityTypes.federatedID:
             raise ArgumentError("You cannot set username except for a federated ID")
-        if email and username and email.lower() == username.lower():
-            raise ArgumentError("Specify just email to set both email and username for a federated ID")
         updates = {}
         for k, v in dict(email=email, username=username,
                          firstname=first_name, lastname=last_name,