Merge pull request #3064 from rcorre/config-write-fix config_write -- handle duplicate section headers when deleting entries