Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Set version to 3.0.10-SNAPSHOT
  Set version to 3.0.9
  Set version to 2.16.20-SNAPSHOT

Change-Id: I3dc6d325220f986db49a4cb3251b20fb718e5569