Merge pull request #11661 from EverythingMe/migrate-storage-1.0.1-1.1

[Bug 907160] data migration from 1.0.1 to 1.1 [r=crdlc]