Removed non-netboot ubuntu server definitions
Fixed up ubuntu server definitions
Renamed ubuntu server for correct arch