Revert "bug #2961 Relations settings not updated on config change"

This reverts commit 1cc3e273086d6ecadfd33073b3a345ce6ff4126d.
Merge branch 'QA_4_1'