- added: stop conflict detection if processing takes too long (more than 15 secs and 5 changes to go)

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