Merge “[fixed] combat patrols from double respawning [fixed] combat patrols…

Merge “[fixed] combat patrols from double respawning [fixed] combat patrols failing to delay [fixed] tweaked combatPatrol AI template” into unstable