Merge branch 'stable-2.9'

* Fix reloading of configuration changes

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