Merge "Fix ONAP entity-event-policy.xml bean package"