> The era of the all-in-one hardware and software solution has been gone for at least the last ten years

Hum, completely backwards; it's the other way around, appliance computer devices are everywhere : NAS, media hub, phones and tablets... it's the customisable computer (the one you can open and extend) which is nearly dead. Everybody buys laptops or small integrated machines like macs mini and the likes.