Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  BUILD: Remove innacurate SNAPSHOT suffix from manifest version

Change-Id: I0e4dc038673f0c0e3949446bee0d72e2fac9f514