Fix some problems with the configuration (not complete fixes, but we do want to move to a new configuration soon).

As part of my ambi cleanup I ran into issues running MCRE locally (see ATEAM-530). These are caused by the fact that some recent changes by Jovan introduce an ordering dependency on MCRE. In this commit I have attempted to make some changes back to the way ConfigDB/ConfiguredFactory expects things to be defined, but there could be further improvements. I can at least run MCRE locally again (as part of a sparse build).