Fixed issues 13,18,28. Modified CSV support for backup / restore to use column order of upgraded entity instead of column names
merged prior fix for issue 18