Added missing times parameter
(cherry picked from commit c2de1a996468fc4c9af2fe50d02a913583a8dbdd)
Added the possibility to get the actual hash of a file if it has been scanned already
(cherry picked from commit 0d00e170d4a6d8a1bff35ddc170ff03512da6224)
Added integration test for equal local and remote file content change
(cherry picked from commit 2b8f6e9d72abae43f068b126009147c3706502c6)
Added next part of the conflict situation of a local and remote file change
(cherry picked from commit 5d65ebf58cc50920e57b09f72cf09c3c0e9fbb76)