configuration: Maintain backward compatibility in define-configuration and fix mode config.
configuration: Maintain backward compatibility in define-configuration and fix mode config.

jmercouris/NeXT,jmercouris/NeXT