Fixes #5003: initial promises on server cause an error to be logged due to duplicate "empty_file_before_editing" setting
Merge pull request #410 from jooooooon/bug_5003/initial_promises_on_server_cause_an_error_to_be_logged_due_to_duplicate_empty_file_before_editing_setting

Fixes #5003: initial promises on server cause an error to be logged due ...
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10