Import outcomes and reports, more CVS options, MappingModes on
codelists.
Merge branch 'dev'