Rebuild auto-generated files.
Reinstate the log.prealloc config that was lost during a merge.
Merge branch 'develop' into log-compress