@bhariharan Second change here: The default store directory will always be removed at the end of this method, regardless of the success or failure of migrating stores.  To leave default stores around for a second attempt is just inviting data clashes with newly-established data.  I consider failures here low-percentage anyway; the only way the migration method will fail is for I/O errors.  In that case, arguably the data is not migratable anyway.