Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Fix log message
  Move ForwardedAwareEventBroker to forwarder package

Change-Id: I6d9f76dff1d51474157657cbce50dd4a0b83fc08