Also reapply a few after recent merge/rebase action in the CP.

Looks like factory_shipped_username was never really honoured here.
Clean this up while bringing general sanity to the file.

see previous

no real changes, just overall sanity

*runs for cover in fear of Ad's uncommited changes*

(a.k.a. migrated to ports tree)

Discussed with: Jos

Huge commit, but the previous commits have proven to be
harmless, so let's do it!