Merge branch 'stable-3.0'

* stable-3.0:
  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: I7e15a3383d1288376ab0bec8415b071c874dfc53
tree: 23b36653d74e43144ad2a782a2b0373f62aa0452
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE