Merge branch 'stable-3.1'

* stable-3.1:
  Set version to 3.0.8-SNAPSHOT
  Set version to 3.0.7

Change-Id: Idf3057b0ccce1bf59fbe9ec14d005799e9e55762