Fix import-data to work with single xlsx file.
Merge remote-tracking branch 'origin/master' into ui-round2