Stronger measurement csv upload handling

Fixes #366 and allows user to upload using aliases/header rows even if the file is in canonical measurement upload format, but using different identifiers (as with data from old embed).

Fixes #367