Merge "Adapt to the renamed events-broker.jar build artifact" into stable-3.6