Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  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: Ia3cff74476f360388d49ee68fc08ed96ab4b03e9
tree: 832be813d8b7519129693ac45b87678577b0cc95
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE