d851: de-commonize thermal-engine config