more data set tweaks, change si/im dev scripts to preserve data_snapshot_data_source node content