Replace ManyToOne relationships for Consumption and Vehicle with primitive long IDs to simplify the entity structure and avoid lazy loading overhead. Closes VSN-1983