Readded diff code that was missing from last merge and some other fixes.

Removed unnecessary printout in CountDiffs.
Fixed data directory location in FileRepositoryInitService.
Re-enabled integration tests.