Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev

* changes:
  Don't add FillEventHistory events to the wrong session.
  Fixed how FillEventHistory is reset and clarified javadoc.