This makes way for backporting the various new configuration options and config file support from 2.x.