Rbarlow add pkg group repo id migration

This pull request adds a symlink to run migration 0004 again as 0006.

It also modified 0004 to be able to handle the case where the migration it is performing causes a uniqueness collision by deleting the offending Unit.

It also contains fixes for some comments that @jdob made about my last PR that I didn't notice until after I had merged (whoops).