Checkin of object mapping for database objects (Tables)
Merge remote branch 'remotes/origin/412-importer' into 412-importer
Checkin for server needs (casing, etc)