OGM-503, OGM-466 Always updating associations completely to make sure changes are propagated properly and to minimize exposure of partially updated assocations
OGM-503 Putting log statement in correct place, avoiding some redundant code