Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Set version to 3.3.10-SNAPSHOT
  Set version to 3.3.9

Change-Id: I94b8dcae6820d5dacf0c6398ac3bb7e4ca69b6cd