(cherry picked from commit 355b59e2) Conflicts: src/journal/test-compress.c src/shared/copy.c Actually keep only compress_blob changes. (cherry picked from commit 63f877db)