Merge "Add config.d watch cleanup"