Merge "Do not create versioned subdirectories in -ref-dump-dir"