Merge branch 'stable-2.16'

* stable-2.16:
  Add Metric containing Gerrit and Java version information

Change-Id: Ic06704d9bdf3d9e8e62b27969ed9039a61b96550