Merge "User: Remove redundant wgClockSkewFudge code"