CMFActivity: do not bypass the max_retry parameter for activities that timeout

See merge request !1880
5 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds