Ensure that cluster-info.pan is included in machine-types/core

+ various base machine-types improvements