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