Utopic test failures due to addition of vivid series

The name for the next release of ubuntu has been announced, and added to utopic:

<http://www.markshuttleworth.com/archives/1425>

This is causing two test failures in the juju-core suite:

PANIC: local_test.go:335: localServerSuite.TestStartInstanceHardwareCharacteristics
...
... Panic: osVersion reported an error: invalid series "vivid" (PC=0x414676)

/usr/lib/go/src/pkg/runtime/panic.c:248
  in panic
/home/ubuntu/juju-core_1.21-alpha2/src/github.com/juju/juju/version/osversion.go:36
  in MustOSFromSeries
/home/ubuntu/juju-core_1.21-alpha2/src/github.com/juju/juju/environs/tools/simplestreams.go:178
  in ToolsMetadata.binary
/home/ubuntu/juju-core_1.21-alpha2/src/github.com/juju/juju/environs/tools/simplestreams.go:327
  in MergeMetadata
/home/ubuntu/juju-core_1.21-alpha2/src/github.com/juju/juju/environs/tools/simplestreams.go:430
  in MergeAndWriteMetadata
/home/ubuntu/juju-core_1.21-alpha2/src/github.com/juju/juju/environs/testing/tools.go:184
  in UploadFakeToolsVersions
/home/ubuntu/juju-core_1.21-alpha2/src/github.com/juju/juju/environs/testing/tools.go:192
  in AssertUploadFakeToolsVersions
local_test.go:341
  in localServerSuite.TestStartInstanceHardwareCharacteristics

...

FAIL: supportedseries_linux_test.go:23: supportedSeriesSuite.TestSupportedSeries

supportedseries_linux_test.go:27:
    c.Assert(series, gc.DeepEquals, expectedSeries)
... obtained []string = []string{"precise", "quantal", "raring", "saucy", "trusty", "utopic", "vivid"}
... expected []string = []string{"precise", "quantal", "raring", "saucy", "trusty", "utopic"}

OOPS: 21 passed, 1 FAILED

<http://juju-ci.vapour.ws:8080/job/run-unit-tests-utopic-amd64/829/console>