Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Validate high-availability plugin using Gerrit CI

Change-Id: Id243a3e3c1b8204af28c989b11e764894b3942a7