Fixed vector clock contention
Fixed checkstyle
Renamed VectorClock to VectorClockTimestamp to prevent ambiguous sense
Merge pull request #2736 from noctarius/fix-vector-clock

Fixed vector clock contention