Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  PolyGerrit: Avatars did not make use of gerrit baseurl

Change-Id: Icddc45a53b2111b572a6b83c2fe3012ecd6c8989