Merge "Fix spaces in MigrateFileRepoLayoutTest::tearDown"