Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  ForwardedIndexChangeHandler: Replace parameter writing with variable
  PeerInfoNotAvailableException: Remove this class as no longer used
  IndexTs: Move local variable to used scope

Change-Id: Ie362795974775d989101c12c16089b3d5a305938