Added override for convert wizard
Fixes to conversion to allow current data selected to override the conversion.
Merge branch 'master' of git@github.com:DawnScience/dawn-common.git