Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ForwardedIndex{Account,Group}Handler: Remove unthrown OrmException declaration

Change-Id: I59db7b8d6a09816ed4be3b87983902b6837bdabc