Merge "openci: Further filter triggering events based on scenario for ODL and ONAP"