Fix issue with replication temporary file not following original rdb directory.
Fix wrong 2.8 merge issue.