Data merging code fixes and cleanup. Temporarily disabled merging data other than SRDA. TODO: re-enable and enhance/implement a strategy for working with multi-source data sets.