[fixed] Mantis #5665/#5667 Squad leader buffs, not reapplying after five
minutes, and terrain negotiation not applying at all.

Change-Id: I8f235ee60655638f23a5495580bf6ab95bec1591
Merge "[fixed] Mantis #5665/#5667 Squad leader buffs, not reapplying after five minutes, and terrain negotiation not applying at all." into unstable