Improved code for moving migrated files in the store directory
Merge pull request #2930 from davidegrohmann/2.1-store-migration-cleanup

Improved code for moving migrated files in the store directory