Merged from trunk r13474.

diff --cc src/DiskIO/IpcIo/IpcIoFile.cc
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/fs/rock/RockRebuild.cc
Simple merge

diff --cc src/globals.h
Simple merge

diff --cc src/store.cc
Simple merge