Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Id82b28f5ef9d8a1acb171579dba30679a61a84a4