Merge "Delete the user key when deleting a user." into mnc-dr-dev