Fix inventory update not triggered

The inventory update should be triggered separately from the core
services update.
Both jobs have been decoupled.

INFRA-1290

app/models.py

@@ -1818,10 +1818,8 @@ def before_flush(session, flush_context, instances):
 
     See http://docs.sqlalchemy.org/en/latest/orm/session_events.html#before-flush
     """
-    if trigger_core_services_update(session):
-        # This will also trigger an inventory update
-        return
     trigger_inventory_update(session)
+    trigger_core_services_update(session)
 
 
 # call configure_mappers after defining all the models