Added column __id to meta-data for user-defined tables. Needed for #2028. Fixed regression tests. Fixed reload to reflect this change. Minor fix.