Merge "Allow some slop on socket time values" into pie-cts-dev