Merge pull request #10354 from AdmiralCurtiss/config-port-core-3 Config: Port EXI device and SI device settings to new config system.
