Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set version to 2.16.15-SNAPSHOT
  Set version to 2.16.14

Change-Id: I988017987c24c7300df6223945ef00d4844534b8