SERVER-11144 Change new config file option structure