ESDEV-2325 Updating inheriteance only for the changed config values. Test fix