Merge "Deprecate internal ORMTable::unprefixFieldName(s)"