HHH-9466 - Drop metamodel package from source
Attempt to fix inserts/updates via NativeQuery