I couldn't actually download 8.7 via the upgrade links because the UK/Britain/Great Britain/England is not listed in the country drop down.
Undeterred I downloaded it from the trial link and installed it, eager to see the support for vSphere 4.
Irritatingly, it has only picked up our 12 vsphere servers as linux boxes, exactly the same as 8.5 did, I've rechecked the community strings are correct, which they are.