Merge branch 'fix/3dnonuniformdiamond_timeout' into 'master'

Increase the timeout parameter for the nonuniform diamond test

Closes #1308

See merge request !3672

(cherry picked from commit a83ae7e0)

cf6098f1 [test][freeflow][nonuniform] increase the timeout parameter for the nonuniform diamond test