Merge branch 'stable-2.8' into stable-2.9

* stable-2.8:
  Prevent possible NPE in AuthorRevision.equals

Change-Id: Id9b86c8a9ab03dc1de8540e020bf30b5a909500a