Merge "Handle deleting dynamic configuration file" into tizen