Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Allow to access source of fetch replication events
  Prevent misleading Invalid id' error in logs

Change-Id: I3db5a83a45b0619182918a9822817b0ce487a420