Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Set version to 3.6.5-SNAPSHOT
  Set version to 3.6.4

Release-Notes: skip
Change-Id: Idb8b7b494d172a8b891a35218b590be3207c2beb