Summary of changes: 2af989c... correct the location of the new config dir in the changelog (*) 1f9f004... improve conf.d/ handling (#643302) (*) This commit already existed in another branch; no separate mail sent