Fix software group migrations

Change-Id: I75513403fa2b056aa56f05373d6a81ff77f4aab1
General cleanup.

Change-Id: Ia2559f27732a803e2ba1facfd1c2c3ab4d4dbfe6