Re-force the Folsom-era Cirros image

Change-Id: I7bb90bc029cff536054f0b24bbf25f53f6c2cfc9
Merge "Re-force the Folsom-era Cirros image"