Merge branch 'stable-3.1'

* stable-3.1:
  Fix extensibility of replication configuration parsing

Change-Id: I57a39ab6ecbdb8cfb6fecf215e805b6e6801f7e7
tree: b65093e20b0cfdac3fd1e3e178812fc44e2f197b
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/