am c4d68391: Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev

* commit 'c4d68391cc39e56b1471a3f5a8d1efbc123503e6':
  fix merge-event-log-tags.py deprecation warning