Fixed for the separate round trip to update both entity and it's associated association.
We need to also fix the previous load from the datastore instead of the EntityEntry structure. OGM-617 describes that.