Merge branch 'stable-2.16'

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

Change-Id: I399a8d700161952b5a2eeb1e3827c07ea8fe854d