[CONFIGURATION] Which CombinedConfiguration

[ralph.goers @dslextreme.com]

I'm trying to port my changes to fix CONFIGURATION-390 from my trunk sandbox
to configuration2-experimental. But there are two CombinedConfiguration
classes, one in the main directory and one under combined. Which one should
be removed and which needs the fix?
Ralph