Merge commit '5c2c3780e2d731c4be05945068bcc622345275be' into dev/bn-prevent-navy-in-pvp-raid-occupy

Conflicts:
	Classes/KIFTestStep.m
Merge commit '33e961d3684d64b88b53929247d3f5a248bb7add' into dev/bn-navy-must-not-die-encounters

Conflicts:
	Classes/KIFTestStep.m