Comment 1 for bug 1599984

This will be important for upgrading; the etc files should be removed if they've been edited, but either the deployer needs to decide that they have been, or we need to provide tooling to detect whether it is or not.

Also, this behavior may mean that overrides support isn't functioning correctly - additional keys, especially from the base, should merge, not be deleted.