Merge branch 'stable-3.0'

* stable-3.0:
  Set Gerrit to 3.0.7
  Set version to 2.16.16
  Set Gerrit to 3.0.6
  Set version to 2.16.15

Change-Id: I05ab458449c7a767f60069d11d2667617689a621