FAIMS-890: increased timeouts
Merge branch 'master' into qa