Improve machine-types/core.pan to work both with old OS templates and new sl5.x/6.x templates