Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  When rescheduling due to in-flight push log also the in-flight task ID

Change-Id: Ifc83d00edc18005b64f1a06e8ef9190f18134264
tree: ad072aac8683a86183201c4bf15d88e6c9ad9111
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE