ZP-361 #comment previous conflict settings (even default settings) are cached, so changing the default-if-not-defined was not honored #time 1h

git-svn-id: https://z-push.org/svn/z-push/trunk@1691 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5