1004086 - Rename migration #11 to #7, and increment migration version #7 to #10 by one.
Merge branch 'rbarlow-1004086'