Merge "Continue to remove users when destroyUserKey fails." into nyc-dev