Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Remove the terms slave and master
  Respect container.replica option for Gerrit replica
  Format with google-java-format 1.7

Change-Id: Ic8271d79467caeda0d58926bc6209204e8eba8ee