Merge branch 'stable-2.8' into stable-2.9

* stable-2.8:
  Add more information about Bouncycastle upgrade in 2.8.5 release notes

Change-Id: Id253044b2f8db8828905128d045120f42b28d9cb