fix lockfile handling by the cron
Merge branch 'version-3-3'
Merge remote-tracking branch 'eressea/master'