Fixing headpin migration

Fixing the headpin migration by setting content view for activation keys and
systems since it is required. Also, setting activation key system group to an
actual system group instead of another key.
Merge pull request #2730 from daviddavis/fix-headpin-migration

Fixing headpin migration
merging for @daviddavis