Force the Folsom-era Cirros image

Change-Id: I7bb90bc029cff536054f0b24bbf25f53f6c2cfc9
Merge branch 'nova-node-name' into dt-test
Merge branch 'common-data' into dt-test
Merge branch 'cirros-image' into dt-test