Reorganize and update default configuration settings. #2456.
Update history to reflect closing of #2456. [ci skip]