Move machine-based options from config.base to host files (#3053)

Move machine-based options from config.base to host files (#3053) #8034