Fix stalling tests in ArchiveCronTest

refs #4141
Merge branch 'master' of https://github.com/piwik/piwik
Merge branch 'master' into uitests