Merge "Exclude users being removed to fix failing tests."