Merge remote branch 'origin/feature/7739_work_multibanks'
Merge remote branch 'origin/feature/7775_new_cncs_geometry'
Re #7779. Make the default error zero if no error column given.

This is surely more sensible than 1!
Also a bit of tidying up in the code around this change.
Merge branch 'bugfix/7779_converttabletomatrix_error_default' into develop