Rename conflicting database migration (bug 1053455)
Merge pull request #2411 from JaredKerim-Mozilla/1053455

Rename conflicting migration (bug 1053455)