Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Extend CommitMessageFetcher to handle non-commit objects

Change-Id: I6f4b9c7ab5992619094754484c1f57093a529b03