Merge ability to have per machine type config entries from ubuntu/silo.