Merge branch 'morosophos/defrag-haste2' into 'master'

Rebase q3 haste changes on top of Mario's buff timers work

Closes #2228

See merge request xonotic/xonotic-data.pk3dir!710

diff --cc qcsrc/common/physics/player.qc
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc ruleset-XDF.cfg
Simple merge

diff --cc xonotic-server.cfg
Simple merge