Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Set version to 3.0.9-SNAPSHOT
  Set version to 3.0.8

Change-Id: I2babaaa2bf369e2c9f9538447d9f2b1385a39744