SWAT update for cirrus

Fixes a maintenance script

Change-Id: I2458bc3b12e2668583852f80a99d735c6d033330