Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set version to 2.16.20-SNAPSHOT

Change-Id: I820d299d93d40db1277a7f537db30de22f3bfe20