Merge branch 'stable-2.5'

This merge was done with the merge strategy 'ours'. The revert commit
was done for stable-2.5 only, in master the commit should not be
reverted.

* stable-2.5:
  Revert "Perform change update on multiple threads"

Change-Id: I13b8a0c7c292a5c8629f773a614d4a0825cd5bc0
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>