increase the waiting time in journal test
Merge branch 'master' into journal