Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add missing log statement if replication was canceled
  When rescheduling due to in-flight push log also the in-flight task ID
  Make sure to always remove in-flight pushes

Change-Id: I938d5ad49e94865515d8e2fe4694da8a605fb53a