Data source information not correct in CSV import

[cbogart]

The entity_source_id field and descriptor are swapped; the identifier column name is null, and these should all end in #username.

mysql> select username, dataset_name, entity_source_descriptor, entity_source_id from user left join data_source_instance on user.fk_data_sources = id_data_source_instance limit 12;
+--------------------+----------------+--------------------------+------------------------------------------+
| username           | dataset_name   | entity_source_descriptor | entity_source_id                         |
+--------------------+----------------+--------------------------+------------------------------------------+
| 005a000000CBeY8AAL | wgu_sample_pii | 2278+0                   | livechattranscript.csv#null#username     |
| 556546             | wgu_sample_pii | 2278+1                   | livechattranscript.csv#null#username     |
| 005a000000CJHieAAH | wgu_sample_pii | 2278+2                   | livechattranscript.csv#null#post         |
| 543122             | wgu_sample_pii | 2248+0                   | livechattranscript.csv#null#post         |
| 005a000000B20bEAAR | wgu_sample_pii | 2248+13                  | livechattranscript.csv#null#username     |
| 386544             | wgu_sample_pii | 2248+14                  | livechattranscript.csv#null#post         |
| 005a000000CBeYhAAL | wgu_sample_pii | 3997+4                   | livechattranscript.csv#null#contribution |
| 136480             | wgu_sample_pii | 3997+5                   | livechattranscript.csv#null#contribution |
| 005a000000CKovZAAT | wgu_sample_pii | 2384+10                  | livechattranscript.csv#null#username     |
| 432823             | wgu_sample_pii | 2384+11                  | livechattranscript.csv#null#username     |