Remove a duplicate virt1008 entry, rearrange a bit.

It looks like a few months ago analytics1007 was recaptured as virt1008,
then subsequently analytics1006 was /also/ recaptured as virt1008.

The box formerly known as analytics1007, then virt1008, is kaput
so I've removed its name entirely.

I've also rearranged the file so that this confusion should be less likely
in the future, and removed a weird stub entry for analytics1007 which I presume
was doing nothing.

Change-Id: I74379e40ec79c955688f162e2de763613b73fc48
Merge "Remove a duplicate virt1008 entry, rearrange a bit." into production