Merge branch 'husk' into 'pregmod-master'

revert $AS change in husk slave swap

Closes #1765

See merge request !6744

src/pregmod/huskSlaveSwapWorkaround.tw

 :: husk Slave Swap Workaround [nobr]
 
-<<if getSlave($AS).tankBaby != 3>>
+<<if $activeSlave.tankBaby != 3>>
 	<<set $nextButton = "Abort Operation", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">>
 <<else>>
 	<<set $nextButton = "Abort Operation", $nextLink = "Main", $returnTo = "Incubator">>